Owen Leonard f4b7e470e7 Bug 15766: (follow-up) Correct merge errors ... This patch corrects some problems applying this on current master and removes an old merge conflict marker. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>		2018-10-24 13:52:42 +00:00
..
acqui	Bug 14786: Use MARC istead of ISO2709 everywhere	2018-10-17 13:55:19 +00:00
admin	Bug 21216: Add filter/search options to notices table	2018-10-24 13:38:48 +00:00
authorities	Bug 21513: Add a 'Cancel' button to the authority editor and remove duplicate 'Save' button	2018-10-17 13:57:35 +00:00
basket	Bug 14786: Use MARC istead of ISO2709 everywhere	2018-10-17 13:55:19 +00:00
batch
catalogue	Bug 21583: Don't use Asset.js for external script files	2018-10-17 12:38:03 +00:00
cataloguing	Bug 20044: Switch single-column templates to Bootstrap grid: Cataloging	2018-10-24 13:05:57 +00:00
circ	Bug 15139: Add non-public item notes to overdue report	2018-10-15 13:56:22 +00:00
clubs	Bug 13272: (follow-up) add missing type="text"	2018-10-01 11:18:32 +00:00
common	Bug 18480: Get rid of unwanted / distracting link in patron search for fund owner	2018-10-15 14:19:08 +00:00
course_reserves	Bug 21409: Add column configuration to course reserves	2018-10-15 14:10:13 +00:00
errors
ill	Bug 20797: (QA follow-up) Fix ill requests table	2018-10-13 08:54:58 -03:00
installer
labels	Bug 15766: (follow-up) Hide description field if the batch is empty	2018-10-24 13:52:42 +00:00
members	Bug 18480: Get rid of unwanted / distracting link in patron search for fund owner	2018-10-15 14:19:08 +00:00
offline_circ
onboarding
patron_lists	Bug 21113: Corrections to patron merge confirmation prompt	2018-10-15 13:22:56 +00:00
patroncards	Bug 15766: (follow-up) Correct merge errors	2018-10-24 13:52:42 +00:00
plugins
reports	Bug 21005: Address QA tool failures on tabs	2018-10-19 17:27:37 +00:00
reserve	Bug 15486: Modify request.tt to handle the new error string	2018-10-24 13:24:05 +00:00
reviews
rotating_collections	Bug 21439: Update two-column templates with Bootstrap grid: Rotating collections	2018-10-17 13:20:51 +00:00
serials	Bug 21505: Box around 'Additional fields' does not contain the fields	2018-10-19 17:27:39 +00:00
services
suggestion	Bug 21454: Remove html filter for Price filtered variables	2018-10-01 13:56:34 +00:00
tags
test
tools	Bug 21216: Add filter/search options to notices table	2018-10-24 13:38:48 +00:00
virtualshelves	Bug 14786: Use MARC istead of ISO2709 everywhere	2018-10-17 13:55:19 +00:00
about.tt	Bug 20554: (follow-up) Add local font files and add method for loading them	2018-10-19 17:27:42 +00:00
auth.tt	Bug 12027: (follow-up) Add missing filter	2018-10-01 13:56:32 +00:00
intranet-main.tt