diff options
| author | vlad <vlad@driver.xyz> | 2017-07-20 10:37:08 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-07-20 10:37:08 -0700 |
| commit | 5279d01cedb35a759347f194c0e8adb21d19e88e (patch) | |
| tree | e340bb2eaba41d917bbca8c5e42b0b76bd164e37 /project | |
| parent | d9c3283c307105e03253c621b9b25a6308ac3b94 (diff) | |
| parent | 7f7bd651122754a3df47894b64ddb0456561bbe7 (diff) | |
| download | rest-query-5279d01cedb35a759347f194c0e8adb21d19e88e.tar.gz rest-query-5279d01cedb35a759347f194c0e8adb21d19e88e.tar.bz2 rest-query-5279d01cedb35a759347f194c0e8adb21d19e88e.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# build.sbt
# src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala
# src/main/scala/xyz/driver/pdsuicommon/domain/User.scala
# src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala
Diffstat (limited to 'project')
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/project/build.properties b/project/build.properties index 4c003f6..6561361 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,4 +1,4 @@ #Activator-generated Properties #Wed Jul 06 16:08:49 PDT 2016 template.uuid=a675a7df-bee3-48df-9eaa-688d99e5814e -sbt.version=0.13.8 +sbt.version=0.13.15 diff --git a/project/plugins.sbt b/project/plugins.sbt index a5ce3ec..83fdd9a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ resolvers += "releases" at "https://drivergrp.jfrog.io/drivergrp/releases" credentials += Credentials("Artifactory Realm", "drivergrp.jfrog.io", "sbt-publisher", "ANC-d8X-Whm-USS") -addSbtPlugin("xyz.driver" % "sbt-settings" % "0.7.34") +addSbtPlugin("xyz.driver" % "sbt-settings" % "0.7.39") |