Skip to content
Commit bc659c02 authored by Peter Rúček's avatar Peter Rúček
Browse files

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
parents 1a88afae 520067cb
Pipeline #232422 passed with warnings with stages
in 5 minutes and 1 second
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment