Build: #8 failed
Job: default failed
Code commits
clowder
-
Todd Nicholson <tcnichol@illinois.edu> d22ad6130f1541e16f7a90e3b17f272e6e102c0a
Merge remote-tracking branch 'remotes/origin/develop' into feature/CATS-715-create-collection-from-zip
# Conflicts:
# app/api/Collections.scala
# app/controllers/Collections.scala
# app/controllers/Files.scala
# app/util/FileUtils.scala