Skip to content
Commit 53f8fc84 authored by Jan Pokorný's avatar Jan Pokorný 🏋🏼
Browse files

Merge remote-tracking branch 'origin/M4-language-school' into M4-language-school 

# Conflicts:
#	application/module-language-school/src/main/java/org/fuseri/modulelanguageschool/user/User.java
parents 9d19e458 c2ff760c
Pipeline #240764 passed with stages
in 2 minutes and 34 seconds