Merge remote-tracking branch 'origin/master' into 2884-improved-picker
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 19 Jun 2014 20:32:13 +0000 (16:32 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 19 Jun 2014 20:32:13 +0000 (16:32 -0400)
commitaea4b0cd7553dfb27c3e6c448fcad349284d6cf4
tree0132726f87f5a6682e8c701a020500b18e0e9364
parentee435c5374d13f187290c7039c0e37dd5ae2ad00
parent085876306dd42d59d97b251e135e6cd157af4216
Merge remote-tracking branch 'origin/master' into 2884-improved-picker
apps/workbench/app/assets/stylesheets/application.css.scss
apps/workbench/app/controllers/collections_controller.rb