Merge branch 'master' into localchanges

jkutner · jkutner · commit 62426228c6dc · 2017-04-28T14:23:28.000-05:00
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -8,4 +8,4 @@ logging.level.org.springframework=INFO
 
 spring.profiles.active=production
 
-server.port=${PORT}
+server.port=${PORT:5000}

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,4 @@ logging.level.org.springframework=INFO`
`8`	`8`
`9`	`9`	`spring.profiles.active=production`
`10`	`10`
`11`		`-server.port=${PORT}`
	`11`	`+server.port=${PORT:5000}`