projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b4b8bac
9013faf
)
Merge branch 'master' into 4570-multi-auth-method
author
Peter Amstutz <peter.amstutz@curoverse.com>
Tue, 6 Jan 2015 13:45:08 +0000
(08:45 -0500)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Tue, 6 Jan 2015 13:45:08 +0000
(08:45 -0500)
1
2
services/api/app/controllers/user_sessions_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
services/api/config/application.default.yml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/api/app/controllers/user_sessions_controller.rb
Simple merge
diff --cc
services/api/config/application.default.yml
Simple merge
projects / arvados.git / commitdiff