Merge branch 'master' into 3400-workbench-all-items
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 12 Nov 2014 18:14:10 +0000 (13:14 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 12 Nov 2014 18:14:10 +0000 (13:14 -0500)
commit6bcb827b1405ce8ca5d767108bc4356ecc2972f4
tree6f8ea0e70f5b23a5492e99b9947ed59b5f71164e
parent093cebc3a4baed645fd5d4a5331c2ff837de8c77
parent53381c90fd5ef26d3a0cc08c8d35318b0b92557a
Merge branch 'master' into 3400-workbench-all-items
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/controllers/collections_controller.rb