Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 28 Feb 2014 13:36:49 +0000 (08:36 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 28 Feb 2014 13:36:49 +0000 (08:36 -0500)
commitf26cbf1c4d949d3e7c7b26ab27c5f4d48d8059ed
treec29abc8c8606240a71decffcaa0d91510e524dd0
parent3baf79475a93929350590d17a95b636408cd603e
parent45bbd49852b4fbd5a6d69122bd4c620c7c9e4674
Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench
apps/workbench/app/assets/stylesheets/application.css.scss
apps/workbench/app/views/layouts/application.html.erb