projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1f91e02
84efd06
)
3781: Merge branch 'master' into 3781-browser-friendly-servers
author
Tom Clegg <tom@curoverse.com>
Wed, 26 Nov 2014 05:56:27 +0000
(
00:56
-0500)
committer
Tom Clegg <tom@curoverse.com>
Wed, 26 Nov 2014 05:56:27 +0000
(
00:56
-0500)
1
2
services/api/app/controllers/application_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/api/app/controllers/application_controller.rb
Simple merge
projects / arvados.git / commitdiff