Merge branch '2640-folder-api' into 1970-folder-view
authorTom Clegg <tom@curoverse.com>
Mon, 5 May 2014 20:14:34 +0000 (16:14 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 5 May 2014 20:14:34 +0000 (16:14 -0400)
commit7871e324112f24527031f4100e4131ff2c6ab245
tree26801b4e759c07768a4cff9a3f6d259cc86e70ad
parentc52a78b386adeebf33c618b669f33ca87c466eee
parent8370640cef5110b65ba6c3a2bf9d7f56541b4c7f
Merge branch '2640-folder-api' into 1970-folder-view
services/api/app/models/arvados_model.rb