Merge remote-tracking branch 'origin/Development' into Development

This commit is contained in:
George Kalampokis 2020-03-26 18:44:39 +02:00
commit 419454daa7
2 changed files with 2 additions and 2 deletions

View File

@ -26,7 +26,7 @@ configuration.configurable_login_providers=
####################INVITATION MAIL CONFIGURATIONS##############
####################GENERIC MAIL CONFIGURATIONS#################
mail.subject=Invitation to DMP Plan {dmpname}
mail.from=TheApp@dev.cite.gr
mail.from=opendmp-dev@cite.gr
####################SPRING MAIL CONFIGURATIONS#################
spring.mail.default-encoding=UTF-8

View File

@ -8,7 +8,7 @@ eu.eudat.logic.proxy.allowed.host=https://eestore.paas2.uninett.no
####################INVITATION MAIL CONFIGURATIONS##############
####################GENERIC MAIL CONFIGURATIONS#################
mail.subject=Invitation to DMP Plan {dmpname}
mail.from=TheApp@dev.cite.gr
mail.from=opendmp-dev@cite.gr
####################SPRING MAIL CONFIGURATIONS#################
spring.mail.default-encoding=UTF-8