projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95cbdf5 61fdce2)
Merge branch 'master' of git.curoverse.com:arvados into 3408-production-datamanager
authormishaz <misha@curoverse.com>
Sun, 11 Jan 2015 18:29:13 +0000 (18:29 +0000)
committerTom Clegg <tom@curoverse.com>
Fri, 13 Feb 2015 21:25:29 +0000 (16:25 -0500)
Conflicts resolved:
services/api/Gemfile
services/api/Gemfile.lock


Trivial merge