Merge branch 'tibor' into 'master'

API 1.0.30+2 CustomerActivity, Sort ExercisePlanTemplateDetail.sort

See merge request bossanyit/aitrainer_server!47
This commit is contained in:
Bossányi Tibor 2021-04-14 21:13:43 +00:00
commit aecb13078c
3 changed files with 623 additions and 302 deletions

File diff suppressed because it is too large Load Diff

View File

@ -17,6 +17,6 @@ logging.config=classpath:logback-spring.xml
logging.file=logs
# if the database structure has been changed, increment this version number
application.version=1.0.29
application.version=1.0.30
jwt.secret=aitrainer

View File

@ -17,6 +17,6 @@ logging.config=classpath:logback-spring.xml
logging.file=logs
# if the database structure has been changed, increment this version number
application.version=1.0.29
application.version=1.0.30
jwt.secret=aitrainer