Merge branch 'master' into 2640-folder-api
authorTom Clegg <tom@curoverse.com>
Sun, 4 May 2014 01:25:19 +0000 (21:25 -0400)
committerTom Clegg <tom@curoverse.com>
Sun, 4 May 2014 01:25:19 +0000 (21:25 -0400)
commit76e20e694fbe708e17e57a2e0b1c36aca6e8d7d0
treebbede00f81ca2ce3f88a83fb6c35d9c44e607023
parent4e05647f7a5b3971771c5a928634c6b2a41aa591
parent988726079e8e2f8ce4b49115c10a8a1d22040972
Merge branch 'master' into 2640-folder-api
services/api/app/controllers/application_controller.rb
services/api/app/models/arvados_model.rb
services/api/app/models/link.rb
services/api/test/fixtures/links.yml