Merge branch 'master' into 3634-tab-state
authorPhil Hodgson <bitbucket@philhodgson.net>
Thu, 18 Sep 2014 21:25:43 +0000 (17:25 -0400)
committerPhil Hodgson <bitbucket@philhodgson.net>
Thu, 18 Sep 2014 21:25:43 +0000 (17:25 -0400)
commitc203e53c2929c2ddf1b079ec077364f8f4d23c40
tree8df0885f9b735bf8ba1e1bb886f094bb3b1239b1
parent09c2c027beb4ac81a07aa94005d87d92389ddd8a
parent67182ab96a8dda99ffa897a2fb04d361cd73777d
Merge branch 'master' into 3634-tab-state

Conflicts:
apps/workbench/app/views/application/_content.html.erb
apps/workbench/Gemfile
apps/workbench/Gemfile.lock
apps/workbench/app/views/application/_content.html.erb