Merge branch '18.05.x' of git://git.koha-community.org/koha into rmain1805
authorLucas Gass <lucasgass@Lucass-MacBook-Pro.local>
Fri, 14 Dec 2018 17:51:41 +0000 (10:51 -0700)
committerLucas Gass <lucasgass@Lucass-MacBook-Pro.local>
Fri, 14 Dec 2018 17:51:41 +0000 (10:51 -0700)
commitad759687347874ce4f17ad1704a2bbc60cc4dfc5
tree234319a10da9ba4e39faf5db72005b6010cd3019
parent1280bace7d797e49a3bc947f264733625247b25d
parent653dc4f67581ee8f0080ebe517c78684b672bfa7
Merge branch '18.05.x' of git://git.koha-community.org/koha into rmain1805