Naida Vatric b933fa96d4 Merge branch 'master' into 'tag-staging-email' ...

# Conflicts:
#   app/config/appConfig.js

2020-02-04 13:07:43 +00:00

..

appConfig.js

Merge branch 'master' into 'tag-staging-email'

2020-02-04 13:07:43 +00:00

config.json

Update database configuration

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