From: Chris Cormack <chris@bigballofwax.co.nz>
Date: Tue, 4 Dec 2018 19:45:58 +0000 (+0000)
Subject: Merge branch 'cherry-pick-1301b72a' into 'master'
X-Git-Tag: 19.05.00~33
X-Git-Url: http://git.equinoxoli.org/?p=kohadocs.git;a=commitdiff_plain;h=affebcfc60113f74ca0705da870917896885f783

Merge branch 'cherry-pick-1301b72a' into 'master'

Merge branch 'patch-6' into 'manual18.11.x'

See merge request koha-community/koha-manual!196
---

affebcfc60113f74ca0705da870917896885f783