Merge branch '3660-project-editable' closes #3660
authorTom Clegg <tom@curoverse.com>
Tue, 26 Aug 2014 00:41:43 +0000 (20:41 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 26 Aug 2014 00:41:43 +0000 (20:41 -0400)
commite4382e25d68a70a107baeb257e1915972759334c
treeab9411ded44505e8f6adc8329c5bd6deec9fa38d
parent5596c93b7938d6c6758a93a0e33cf4a5c185c445
parent6f86d6365b4505601370b9587d5e082e17a657c3
Merge branch '3660-project-editable' closes #3660
services/api/app/models/arvados_model.rb
services/api/test/unit/permission_test.rb