Merge branch 'master' into 3112-report-bug
authorradhika <radhika@curoverse.com>
Tue, 26 Aug 2014 15:17:24 +0000 (11:17 -0400)
committerradhika <radhika@curoverse.com>
Tue, 26 Aug 2014 15:17:24 +0000 (11:17 -0400)
commit58b6e6889cf9f9b108fe4a6ba7a100713bedbab9
tree2766f9c68843be9331cda2ddc29bfecaf853c04d
parentea4e4e5e0b85d6cd974f677edb886cd4ed244513
parentd5835c0402a581b1b4379c71f711a6fdf86fdab5
Merge branch 'master' into 3112-report-bug
apps/workbench/app/controllers/actions_controller.rb
apps/workbench/app/controllers/application_controller.rb