Merge branch 'master' into 3354-render-textile
authorPhil Hodgson <bitbucket@philhodgson.net>
Wed, 20 Aug 2014 13:04:54 +0000 (09:04 -0400)
committerPhil Hodgson <bitbucket@philhodgson.net>
Wed, 20 Aug 2014 13:04:54 +0000 (09:04 -0400)
commita3222e35cda68c8e48a17921c33ac37ecb5c3bac
tree23189993894b15decbd77c06e49c5fc2fd51e1bf
parentf82085bd3a31d92c49db6b210e8737def65be6cb
parent6b0ad588b44ee30cd400e85031b56dcb2a8ac567
Merge branch 'master' into 3354-render-textile

Conflicts (resolved):
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/helpers/application_helper.rb