Merge branch 'master' into 2060-edit-tags-in-workbench
authorTom Clegg <tom@curoverse.com>
Sun, 16 Feb 2014 11:05:35 +0000 (03:05 -0800)
committerTom Clegg <tom@curoverse.com>
Sun, 16 Feb 2014 11:05:35 +0000 (03:05 -0800)
commit6812b3350f48ed977ea2e3e788e49e1008a3b244
treece68bbcd94854237bf2232e18bc1200382d40ea0
parent78a1683680177da480dc3ffaea2d4f2b79ab793d
parent4290ebf2130f74b1a7448f073b0bfb2394e4e8bf
Merge branch 'master' into 2060-edit-tags-in-workbench
apps/workbench/app/assets/javascripts/application.js