projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4fa74e 21d528d)
Merge branch '3781-browser-friendly-servers' refs #3781
authorTom Clegg <tom@curoverse.com>
Mon, 1 Dec 2014 23:02:27 +0000 (18:02 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 1 Dec 2014 23:02:27 +0000 (18:02 -0500)
1  2 
services/api/config/routes.rb patch | diff1 | diff2 | blob | history

diff --cc services/api/config/routes.rb
Simple merge