Merge branch 'release-3.1'

60e1299e · Demian Katz · 71a66626 · 6b409eeb · 60e1299e · 60e1299e
Commit 60e1299e authored 8 years ago by Demian Katz
--- a/import/lib/marc4j-2.7.2.jar
+++ b/import/lib/marc4j-2.7.2.jar
--- a/import/solrmarc_core.jar
+++ b/import/solrmarc_core.jar
--- a/themes/bootstrap3/templates/search/advanced/eds.phtml
+++ b/themes/bootstrap3/templates/search/advanced/eds.phtml
@@ -128,4 +128,4 @@ JS;
      <?=$this->inlineScript(\Zend\View\Helper\HeadScript::SCRIPT, $script, 'SET'); ?>
    </fieldset>
  <? endif; ?>
-</div>
\ No newline at end of file
+</div>