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 /src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala | |
| 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 'src/main/scala/xyz/driver/pdsuicommon/acl/ACL.scala')
0 files changed, 0 insertions, 0 deletions