Skip to content
Commit 227df268 authored by Tomáš Tomala's avatar Tomáš Tomala
Browse files

Conform to newest develop branch

commit c7a80562
Merge: b9bc6171 90859c71
Author: Kryštof-Mikuláš Štys <xstys@fi.muni.cz>
Date:   Fri Apr 14 20:42:24 2023 +0200

    Merge branch 'fix-naming-scheme' into 'develop'

    [Feat] Naming fix

    See merge request !25

commit 90859c71
Author: Kryštof-Mikuláš Štys <493159@mail.muni.cz>
Date:   Fri Apr 14 19:43:51 2023 +0200

    [Fix] Conflicts resolution

commit bdd226af
Merge: 38335c2c b9bc6171
Author: Kryštof-Mikuláš Štys <493159@mail.muni.cz>
Date:   Fri Apr 14 19:32:52 2023 +0200

    Merge branch 'develop' into fix-naming-scheme

commit b9bc6171
Merge: 9de86e32 7ca275ea
Author: Kryštof-Mikuláš Štys <xstys@fi.muni.cz>
Date:   Fri Apr 14 19:26:48 2023 +0200

    Merge branch 'flight-detail' into 'develop'

    Flight detail

    See merge request !24

commit 7ca275ea
Author: Kryštof-Mikuláš Štys <493159@mail.muni.cz>
Date:   Fri Apr 14 19:08:54 2023 +0200

    [Fix] Endpoint issues

commit 38335c2c
Author: Kryštof-Mikuláš Štys <493159@mail.muni.cz>
Date:   Fri Apr 14 17:14:12 2023 +0200

    [Feat] Naming fix

commit 8af05d57
Author: Kryštof-Mikuláš Štys <493159@mail.muni.cz>
Date:   Fri Apr 14 16:29:46 2023 +0200

    [Feat] Initial version before testing

commit ac8f3b77
Author: Kryštof-Mikuláš Štys <493159@mail.muni.cz>
Date:   Fri Apr 14 11:55:23 2023 +0200

    [Feat] DTO restructuring for FlightDetails + Stewards find by ids

commit 99a9ebda
Merge: 593020bf 9de86e32
Author: Kryštof-Mikuláš Štys <493159@mail.muni.cz>
Date:   Fri Apr 14 10:04:39 2023 +0200

    Merge branch 'develop' into flight-detail

commit 593020bf
Author: Kryštof-Mikuláš Štys <493159@mail.muni.cz>
Date:   Thu Apr 13 19:46:20 2023 +0200

    [Feat] DomainDetailDto initial steps
parent 9de86e32
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment