Merge remote-tracking branch 'origin/master'

Fork: 0

microservice / teacher-diary

Browse code Merge remote-tracking branch 'origin/master' # Conflicts: # .dockerignore # Dockerfile # README.md master
commit f7a3fa0c480be53e1350ec9b2c522f5823fa087f 2 parents 7216c35 + 33d8e88 malexple authored 14 days ago

Patch

Unified Split

Showing 8 changed files

Ignore Space Show notes View .dockerignore

Ignore Space Show notes View README.md

Ignore Space Show notes View src/main/java/ru/mcs/diary/auth/AuthService.java

Ignore Space Show notes View src/main/java/ru/mcs/diary/auth/ParentInviteTokenRepository.java

Ignore Space Show notes View src/main/java/ru/mcs/diary/common/service/MailService.java

Ignore Space Show notes View src/main/resources/application.yml

Ignore Space Show notes View src/main/resources/templates/auth/parent-invite-error.html

Ignore Space Show notes View src/main/resources/templates/auth/parent-invite.html

Show line notes below