Public Git Hosting - koha.git/commit

commit	a05c1cb9a60ea40a6b2716a16136ca92488a979f
author	Nick Clemens <nick@bywatersolutions.com>
	Fri, 26 Oct 2018 19:43:20 +0000 (26 19:43 +0000)
committer	Nick Clemens <nick@bywatersolutions.com>
	Fri, 26 Oct 2018 19:43:20 +0000 (26 19:43 +0000)
tree	d86f32a9b64f58bbb69aebd31c3883058d98ded2	tree \| snapshot (tar.gz zip)
parent	89bad1fa460dc75bdaeb40e82ee56639e35fe0c9	commit \| diff

Bug 21526: (RM follow-up) Fix merge markers and a few extra filters

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Koha ILS

koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt		diff \| blob \| blame \| history
koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt		diff \| blob \| blame \| history
koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt		diff \| blob \| blame \| history
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt		diff \| blob \| blame \| history