Merge branch 'main' into 28-setup-oauth2
# Conflicts: # library-management/src/main/java/cz/muni/fi/pa165/seminar3/librarymanagement/author/AuthorController.java # library-management/src/main/java/cz/muni/fi/pa165/seminar3/librarymanagement/book/BookController.java # library-management/src/main/java/cz/muni/fi/pa165/seminar3/librarymanagement/borrowing/BorrowingController.java # library-management/src/main/java/cz/muni/fi/pa165/seminar3/librarymanagement/fine/FineController.java # library-management/src/main/java/cz/muni/fi/pa165/seminar3/librarymanagement/payment/PaymentController.java # library-management/src/main/java/cz/muni/fi/pa165/seminar3/librarymanagement/reservation/ReservationController.java # library-management/src/main/java/cz/muni/fi/pa165/seminar3/librarymanagement/settings/SettingsController.java # library-management/src/main/java/cz/muni/fi/pa165/seminar3/librarymanagement/user/UserController.java # library-management/src/main/resources/application.yml
Loading
Please register or sign in to comment