Bug 18887: Fix issues caused by rebase
authorKyle M Hall <kyle@bywatersolutions.com>
Wed, 18 Jul 2018 17:55:19 +0000 (13:55 -0400)
committerNick Clemens <nick@bywatersolutions.com>
Wed, 3 Oct 2018 17:58:13 +0000 (17:58 +0000)
commit5c31b9c75e3beeeb26ab9f96c568e73ec932874f
tree9328c6cc5bdad548c7a0f15bee5d6dda259be0c4
parentb9727d20582164da578d125db80576e72e050d2a
Bug 18887: Fix issues caused by rebase

Signed-off-by: Lisette Scheer <lisetteslatah@gmail.com>

Signed-off-by: Jesse Maseto <jesse@bywatersolution.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
admin/smart-rules.pl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt