Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/midas-isg/ls into front-e…
Browse files Browse the repository at this point in the history
…nd-updates
  • Loading branch information
TPS23 committed Aug 10, 2017
2 parents 050646b + ebe8e45 commit 4689347
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions conf/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ play.evolutions.enabled=false
play.http.context="/ls"

# Application version. This is read by build.sbt
app.version="1.2.1"
app.version="2.0.0"

# Set max post text (body) size
#parsers.text.maxLength=10240K
Expand All @@ -107,4 +107,4 @@ spew.base.url="spew.olympus.psc.edu/syneco/spe#"
# 'application_overrides.conf' is used for environment-specific overrides & properties as it should
# be excluded via '.gitignore'
include "application_overrides.conf"
# DO NOT add any line after this. Insert them above this part.
# DO NOT add any line after this. Insert them above this part.

0 comments on commit 4689347

Please sign in to comment.