Skip to content
Commit 1f9a0864 authored by Tomáš Tomala's avatar Tomáš Tomala
Browse files

Merge from develop - Conform to newest version of develop

commit ec19fe7b
Merge: 88c228c6 48af7e78
Author: Kryštof-Mikuláš Štys <xstys@fi.muni.cz>
Date:   Sun Apr 16 19:10:31 2023 +0200

    Merge branch 'order_of_methods' into 'develop'

    Order of methods & @RequestBody fix

    See merge request !46

commit 88c228c6
Merge: 3daccd2b ffb5afdc
Author: Kryštof-Mikuláš Štys <xstys@fi.muni.cz>
Date:   Sun Apr 16 19:07:10 2023 +0200

    Merge branch 'continuation-of-flights-tests' into 'develop'

    Continuation of flights tests + tests refactoring + fixes

    See merge request !45

commit 48af7e78
Author: Matej Gorgol <56208414+Mateorid@users.noreply.github.com>
Date:   Sun Apr 16 19:06:56 2023 +0200

    moved public method

commit f830cbaa
Author: Matej Gorgol <56208414+Mateorid@users.noreply.github.com>
Date:   Sun Apr 16 19:05:49 2023 +0200

    added @RequestBody to airlines controller

commit ffb5afdc
Author: Kryštof-Mikuláš Štys <493159@mail.muni.cz>
Date:   Sun Apr 16 18:34:17 2023 +0200

    [Fix] Query refactoring for deletion

commit 1a5905f5
Author: Kryštof-Mikuláš Štys <493159@mail.muni.cz>
Date:   Sun Apr 16 18:31:41 2023 +0200

    [Feat] Integration tests and refactoring deleting, updating and adding
parent 94660d29
Loading
Loading
Loading