Merge branch 'release-1.1'

duke-libraries · Oct 15, 2018 · 085e187 · 085e187
2 parents fb1a97c + 3882c9f
commit 085e187
Show file tree

Hide file tree

Showing 17 changed files with 263 additions and 140 deletions.
diff --git a/.fcrepo_wrapper b/.fcrepo_wrapper
@@ -1,5 +1,5 @@
 # Place any default configuration for fcrepo_wrapper here
-version: 4.7.4
+version: 4.7.5
 port: 8984
 enable_jms: false
 fcrepo_home_dir: tmp/fcrepo4-development-data
diff --git a/Gemfile b/Gemfile
@@ -22,7 +22,7 @@ gem 'devise-guests', '~> 0.6'
 gem 'omniauth-shibboleth'
 gem 'curb', '~> 0.9.4'
 
-gem 'hyrax', '2.1.0'
+gem 'hyrax', '2.3.3'
 
 gem 'resque'
 gem 'resque-pool'