Merge branch '1694-user-agreement'
authorTom Clegg <tom@curoverse.com>
Thu, 2 Jan 2014 22:00:42 +0000 (14:00 -0800)
committerTom Clegg <tom@curoverse.com>
Thu, 2 Jan 2014 22:00:42 +0000 (14:00 -0800)
commitc185e2e2eb0a411b40e8d34c5e0bfe31addedcff
treea96207e4843408ab31ae3afa764fee0b425bf620
parent6376dc9ef711e339c10e17349eee4c0fc022899c
parentb54435b16c3f6b22d4526d543c276c314143d124
Merge branch '1694-user-agreement'
apps/workbench/app/controllers/collections_controller.rb