Merge branch 'release/0.4.2'

FAForever · Apr 11, 2017 · 9a0e43c · 9a0e43c
2 parents b8a8ddf + eb78102
commit 9a0e43c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'propdeps'
 
 group = 'micheljung'
-version = '0.4.1'
+version = '0.4.2'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml
@@ -42,6 +42,8 @@ faf-api:
         replaceExisting: true
   registration:
     activation-url-format: ${ACTIVATION_URL_FORMAT}
+  mail:
+    mandrill-api-key: ${MANDRILL_API_KEY}
 
 spring:
   datasource: