5416: Merge branch 'master' into 5416-arv-git-httpd
authorTom Clegg <tom@curoverse.com>
Mon, 30 Mar 2015 17:00:59 +0000 (13:00 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 30 Mar 2015 17:00:59 +0000 (13:00 -0400)
commitd843787b4ece9952597d7814cbf10fb383c72625
tree59c19de117d41b67000697d85778443a78fe78d6
parentce4e75d03a38fc7e4a644a08e3c6044e3a7df390
parentd176328c5a9f95a3e7295d1341b4e6d88c0025f7
5416: Merge branch 'master' into 5416-arv-git-httpd
doc/_config.yml
services/api/app/controllers/arvados/v1/schema_controller.rb