projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cab3866
2d0dd74
)
Merge branch '5105-ajax-redirect' closes #5105
author
Tom Clegg <tom@curoverse.com>
Tue, 10 Mar 2015 19:46:26 +0000
(15:46 -0400)
committer
Tom Clegg <tom@curoverse.com>
Tue, 10 Mar 2015 19:46:26 +0000
(15:46 -0400)
1
2
apps/workbench/app/controllers/application_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/controllers/application_controller.rb
Simple merge