Merge branch 'user/cburton/LP1778972_OPAC_Redesign' of git://git.Evergreen-ils.org...

diff --cc Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts
Simple merge

diff --cc Open-ILS/src/sql/Pg/upgrade/1206.function.distinct-regen_copy_map.sql
index a1ecf1b,a1ecf1b..0000000
deleted file mode 100644,100755
--- 1/Open-ILS/src/sql/Pg/upgrade/1206.function.distinct-regen_copy_map.sql
--- 2/Open-ILS/src/sql/Pg/upgrade/1206.function.distinct-regen_copy_map.sql
+++ /dev/null
@@@ -1,12 -1,12 +1,0 @@@
--BEGIN;
--
--SELECT evergreen.upgrade_deps_block_check('1206', :eg_version);
--
--CREATE OR REPLACE FUNCTION
--    action.hold_request_regen_copy_maps(
--        hold_id INTEGER, copy_ids INTEGER[]) RETURNS VOID AS $$
--    DELETE FROM action.hold_copy_map WHERE hold = $1;
--    INSERT INTO action.hold_copy_map (hold, target_copy) SELECT DISTINCT $1, UNNEST($2);
--$$ LANGUAGE SQL;
--
--COMMIT;

diff --cc Open-ILS/src/templates/staff/cat/bucket/copy/t_view.tt2
Simple merge

diff --cc Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
Simple merge