2760: Merge branch 'master' into 2760-folder-hierarchy
authorTom Clegg <tom@curoverse.com>
Fri, 23 May 2014 21:12:33 +0000 (17:12 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 23 May 2014 21:12:33 +0000 (17:12 -0400)
commit56d21dc3d5823117729df3db6186da96f277b328
tree6be915b8c2d955ef32dbb6241c3432e71c864b33
parent7a82503a45c632918f8f032913dbbf6711a02e2e
parentb28565c8aa08cbf70762fa69e49c5067fcb57e96
2760: Merge branch 'master' into 2760-folder-hierarchy
apps/workbench/app/controllers/application_controller.rb
apps/workbench/app/views/layouts/application.html.erb
apps/workbench/config/routes.rb