Merge branch 'master' into 3354-render-textile
authorPhil Hodgson <bitbucket@philhodgson.net>
Mon, 11 Aug 2014 11:22:45 +0000 (07:22 -0400)
committerPhil Hodgson <bitbucket@philhodgson.net>
Mon, 11 Aug 2014 11:22:45 +0000 (07:22 -0400)
commit02c368b2e6f6fd05930db1b57e5887b82a6c8b36
tree6410a6dde188fe10fcd349ee6a1e236db02eb52b
parentcd1c3d8ddae9b743fe557881005e08a63785e49e
parent381926c94a3b41d04101f68ec6a33e88fc795254
Merge branch 'master' into 3354-render-textile
apps/workbench/app/controllers/application_controller.rb