Merge remote-tracking branch 'origin/master'

Fork: 0

nitta-lab-2024 / CitrusServer

Browse code Merge remote-tracking branch 'origin/master' # Conflicts: # src/main/java/org/ntlab/citrusserver/repositories/BookManager.java Todo master nitta-lab-2024-putTodo ppp scheduleManagersakoda
commit 52337ea29bfd47a97d5e45b08b59109bdaf76200 2 parents a395b9f + 86280f2 g-shimokawa authored on 22 Oct

Patch

Unified Split

Showing 11 changed files

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/entities/Account.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/repositories/AccountManager.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/repositories/BookManager.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/repositories/ScheduleManager.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/repositories/TodoManager.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/resources/AccountsRest.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/resources/FavoritedRest.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/resources/FavoritesRest.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/resources/PublicBooksRest.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/resources/ScheduleRest.java

Ignore Space Show notes View src/main/java/org/ntlab/citrusserver/resources/TodoRest.java

Show line notes below