Merge branch 'master' into 2060-edit-tags-in-workbench
authorTom Clegg <tom@curoverse.com>
Sun, 16 Feb 2014 10:36:57 +0000 (02:36 -0800)
committerTom Clegg <tom@curoverse.com>
Sun, 16 Feb 2014 10:36:57 +0000 (02:36 -0800)
commit50567a15ccfdc5e73289227e343bfce946974ecd
treea9515afcdb75a724a5e1658ce91a420a5de8d934
parent603517c58cb2a57961de70c7b67f9856206515da
parent3d3f6b1262bd416ca1c7a2deb6ac87099f662edd
Merge branch 'master' into 2060-edit-tags-in-workbench
apps/workbench/app/assets/javascripts/application.js