Merge remote-tracking branch 'remotes/origin/3504-clients-compatible-with-3036' into...
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 22 Aug 2014 13:07:40 +0000 (09:07 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 22 Aug 2014 13:07:40 +0000 (09:07 -0400)
commit86c4b60b5f9e8ab1f20eeee1da0afce3db57ab3b
tree67c44a73393436b5227156e480e8032f922e9b77
parentcb07b2362dadab18abc43e2385cf7b54ed33a7e5
parentda8b7405a6d4c774ecdcaaec18ba57e3bb1e8249
Merge remote-tracking branch 'remotes/origin/3504-clients-compatible-with-3036' into 3036-collection-uuids

Conflicts:
apps/workbench/app/views/projects/_show_contents_rows.html.erb