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)
commit5126d94fd644a657243e5ec80d5ef1fc250f8b76
treec08b2c9ec58fa0b7116bab79273a2429f83c6367
parent10071dfd716b0131dfd5cd6d782422beef950f61
parenta9980e0967507a3d74a12f93d82f8330c8ce3009
Merge branch '2873-permission-links-ownership'

Closes #2873. Huzzah!
services/api/app/controllers/arvados/v1/links_controller.rb
services/api/app/models/user.rb