Merge branch 'master' into 3661-copy-move-from-show
authorPhil Hodgson <bitbucket@philhodgson.net>
Thu, 18 Sep 2014 19:13:41 +0000 (15:13 -0400)
committerPhil Hodgson <bitbucket@philhodgson.net>
Thu, 18 Sep 2014 19:13:41 +0000 (15:13 -0400)
commit4154420cdd2a2ac6cdb2cc57357f42513fb287cc
treee061f5cadeb959d04141133880a54d3575c28e4e
parent6f2433691034b6e223445c5a047554ee7c6f92c1
parent58ccc8f13d66fc3da1aecb392a6698a29958e203
Merge branch 'master' into 3661-copy-move-from-show

Conflicts:
apps/workbench/app/assets/javascripts/selection.js.erb
apps/workbench/test/integration/collections_test.rb
apps/workbench/app/assets/javascripts/selection.js.erb
apps/workbench/app/views/application/show.html.erb
apps/workbench/app/views/collections/show.html.erb
apps/workbench/app/views/projects/show.html.erb
apps/workbench/test/integration/collections_test.rb
apps/workbench/test/integration/projects_test.rb