Merge branch 'master' of gitlab.com:carolinecyrlarose/koha-manual
authorCaroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Fri, 22 Feb 2019 21:59:16 +0000 (16:59 -0500)
committerCaroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Fri, 22 Feb 2019 21:59:16 +0000 (16:59 -0500)

Trivial merge