Merge branch 'master' into 3177-collection-choose-files
authorradhika <radhika@curoverse.com>
Wed, 12 Nov 2014 20:47:27 +0000 (15:47 -0500)
committerradhika <radhika@curoverse.com>
Wed, 12 Nov 2014 20:47:27 +0000 (15:47 -0500)
commita0e70cf1da033f7d94e728ab919bd8cfcabf3743
tree72f37754cdbcf71c6fc7fa675b999609c5978f6d
parentc28b9b91028c90497455bfde188915982377b825
parent8f9f0dece977ccf5a778f3b3bd2379375e723c18
Merge branch 'master' into 3177-collection-choose-files

Conflicts:
apps/workbench/app/views/collections/_choose_rows.html.erb
apps/workbench/app/views/collections/_choose_rows.html.erb