Bug 25728: fix rebase issues
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Sat, 22 Aug 2020 09:15:28 +0000 (11:15 +0200)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 24 Aug 2020 09:19:03 +0000 (11:19 +0200)
commitc6ad2eba4d1ef931f1ef2e71544fd4d52742c2cf
treea68f5e7a6c870064216ea6ddba52a663bc82113f
parent3e2966839ef1f279f2e76f3a7ad91dab33a2a3df
Bug 25728: fix rebase issues

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
koha-tmpl/intranet-tmpl/prog/js/cataloging.js