Merge remote-tracking branch 'origin/master' into 1971-show-image-thumbnails
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 17 Apr 2014 12:50:39 +0000 (08:50 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 17 Apr 2014 12:50:39 +0000 (08:50 -0400)
commit30b02581c938c05b804f7510a1fc8e850830b9cd
treeaf3bf24cef86a85404369b040af7e35f295a0158
parentc9f04f87062eec4097dc74dcc79b364fb905851c
parent2f91702d89b7a64093465a1923b87acade6b9715
Merge remote-tracking branch 'origin/master' into 1971-show-image-thumbnails
apps/workbench/app/helpers/application_helper.rb