projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 10071df a9980e0)
Merge branch '2873-permission-links-ownership'
authorTim Pierce <twp@curoverse.com>
Thu, 3 Jul 2014 15:45:47 +0000 (11:45 -0400)
committerTim Pierce <twp@curoverse.com>
Thu, 3 Jul 2014 15:45:47 +0000 (11:45 -0400)
Closes #2873. Huzzah!

1  2 
services/api/app/controllers/arvados/v1/links_controller.rb patch | diff1 | diff2 | blob | history
services/api/app/models/user.rb patch | diff1 | diff2 | blob | history

diff --cc services/api/app/models/user.rb
Simple merge