Naida Vatric 0f91841c43 Merge branch 'master' into 'checkup-email' ...

# Conflicts:
#   app/config/appConfig.js
#   app/services/notificationService.js

2020-01-31 21:59:26 +00:00

..

appConfig.js

Merge branch 'master' into 'checkup-email'

2020-01-31 21:59:26 +00:00

config.json

Update database configuration

2019-05-21 12:11:30 +02:00