Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 27 Feb 2014 21:18:03 +0000 (16:18 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 27 Feb 2014 21:18:03 +0000 (16:18 -0500)
commit89355aa0e2727373fa60c781ec6c00c31a79a7dc
treeaf96acb7893ad708befcdc8ebd03053e0a216dd7
parent9e778a62184d4604f62e6c30fec8d1be1781de4b
parentd7a07294a8d4a546852a33417972924f658e4024
Merge remote-tracking branch 'origin/master' into 2049-run-job-from-workbench

Conflicts:
apps/workbench/app/views/layouts/application.html.erb
apps/workbench/app/assets/stylesheets/application.css.scss
apps/workbench/app/views/layouts/application.html.erb