Merge branch 'master' into 3112-report-bug
authorradhika <radhika@curoverse.com>
Mon, 25 Aug 2014 18:36:55 +0000 (14:36 -0400)
committerradhika <radhika@curoverse.com>
Mon, 25 Aug 2014 18:36:55 +0000 (14:36 -0400)
commitc6378b0e7da030652334366c8459ff3853811529
tree742aec9714cdb217e45759f218ca07372c613e1d
parent32e4350b4ea4c111ae95d9a99712fb86bf0ecb86
parentda34478ce3e42df6d138c6e6e1db7c49d9d5902c
Merge branch 'master' into 3112-report-bug
apps/workbench/app/controllers/application_controller.rb