Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/issue-3299' into issue-3299
Browse files Browse the repository at this point in the history 
# Conflicts:
#	app/forms/hyrax/forms/work_form.rb
#	app/indexers/hyrax/basic_metadata_indexer.rb
#	spec/forms/hyrax/forms/work_form_spec.rb
  • Loading branch information
@dlpierce
dlpierce committed Apr 17, 2019
2 parents 3c6008b + d951457 commit cf0cd9c
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit cf0cd9c

Please sign in to comment.