projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a28be6d
b914818
)
Merge branch 'master' into 1969-persistent-switch
author
Tom Clegg <tom@curoverse.com>
Fri, 25 Apr 2014 20:53:13 +0000
(16:53 -0400)
committer
Tom Clegg <tom@curoverse.com>
Fri, 25 Apr 2014 20:53:13 +0000
(16:53 -0400)
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