Bug 11317: (follow-up) Add two-level entry to koha-conf and remove unwanted characters
commit67ec2ead88c7d58f7977a206ad75f00eddef8095
authorRoch D'Amour <roch.damour@inlibro.com>
Mon, 23 Apr 2018 13:20:35 +0000 (23 09:20 -0400)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Thu, 3 May 2018 16:26:50 +0000 (3 13:26 -0300)
treec375ce96357dafe6e6742004de0bb69c24028f09
parent0f9ec1287539e61f4dd089131cf69cb90fb3f8e2
Bug 11317: (follow-up) Add two-level entry to koha-conf and remove unwanted characters

- Removed merge marker
- Changed include path in favor of using the Asset tt plugin (bug 20538)
- Changed access_dir to a two-level entry for clarity

Test plans stay the same, just make sure that the two-level configuration entry
work properly and everything pass QA.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
debian/templates/koha-conf-site.xml.in
etc/koha-conf.xml
koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
tools/access_files.pl