Merge branch 'master' into 2060-edit-tags-in-workbench
authorTom Clegg <tom@curoverse.com>
Sun, 16 Feb 2014 08:26:54 +0000 (00:26 -0800)
committerTom Clegg <tom@curoverse.com>
Sun, 16 Feb 2014 08:26:54 +0000 (00:26 -0800)
commit7024cc159936593350aaf7939d700102f6510787
treefdd3ef01c073bed6a2f7542ff9d125a19a2bf895
parent579300424ef50990ff9414f2eabf8f371f278d99
parentccf75b956a181b3867b0a3ce819607033a6775d0
Merge branch 'master' into 2060-edit-tags-in-workbench

Conflicts:
apps/workbench/app/assets/javascripts/application.js
apps/workbench/app/assets/stylesheets/application.css.scss
apps/workbench/app/assets/javascripts/application.js
apps/workbench/app/assets/stylesheets/application.css.scss