Merge branch '17.11.x' of git.koha-community.org:koha into 1711_rel
authorNick Clemens <nick@bywatersolutions.com>
Thu, 4 Jan 2018 16:11:45 +0000 (11:11 -0500)
committerNick Clemens <nick@bywatersolutions.com>
Thu, 4 Jan 2018 16:12:15 +0000 (11:12 -0500)
commit68dd17880fc8c9ddc37da25278f8302f86850925
tree6d67abc1a36a8f351e04ef2d2a3a355dc4b96344
parent58218f12702dbf9f8ff0ab86eb2e729817610d38
parent03864feb387ebc75b23ec0d15472e8435b4277f3
Merge branch '17.11.x' of git.koha-community.org:koha into 1711_rel