Merge branch 'master' into 2096-demo-feedback
authorTom Clegg <tom@curoverse.com>
Wed, 12 Feb 2014 19:57:50 +0000 (11:57 -0800)
committerTom Clegg <tom@curoverse.com>
Wed, 12 Feb 2014 19:57:50 +0000 (11:57 -0800)
commit975e9af85c66fa710728382d1efc66816c25f368
treeb1a72e907137c0ebbfba6a1ad6401b718668a190
parent5d33c55fceab01d0ec426b9961e75a6ccddc7f8a
parent3f3c680cdb5a9053dd074bc35070dc07b405f6d8
Merge branch 'master' into 2096-demo-feedback
apps/workbench/app/views/layouts/application.html.erb