Merge branch '4.1' of git.unl.edu:iim/UNL_Search into 4.1

06a5d19c · Michael Fairchild · 3d97e547 · 7559ea0b · 06a5d19c · 06a5d19c
Commit 06a5d19c authored 9 years ago by Michael Fairchild
--- a/www/js/embed-src/require-css/css.js
+++ b/www/js/embed-src/require-css/css.js
--- a/www/js/embed-src/require-css/normalize.js
+++ b/www/js/embed-src/require-css/normalize.js
--- a/www/js/embed-src/require.js
+++ b/www/js/embed-src/require.js
--- a/www/js/search.js
+++ b/www/js/search.js
--- a/www/less/search-google.less
+++ b/www/less/search-google.less
--- a/www/less/search.less
+++ b/www/less/search.less
--- a/www/templates/embed-debug.tpl.php
+++ b/www/templates/embed-debug.tpl.php
--- a/www/templates/embed.tpl.php
+++ b/www/templates/embed.tpl.php
--- a/www/templates/end-scripts.tpl.php
+++ b/www/templates/end-scripts.tpl.php
--- a/www/templates/search-form.tpl.php
+++ b/www/templates/search-form.tpl.php
--- a/www/templates/search-results.tpl.php
+++ b/www/templates/search-results.tpl.php