Merge branch 'newfeatures' into 'master'
authorLee Jamison <ldjamison@marywood.edu>
Thu, 17 May 2018 17:12:30 +0000 (17:12 +0000)
committerLee Jamison <ldjamison@marywood.edu>
Thu, 17 May 2018 17:12:30 +0000 (17:12 +0000)
commited5dc3ca062d0cf0abcc61e52dd07a42a7d2e97c
tree1d63054f479b6c59b65be341c1215957a8b4f614
parent651ca7da63f0cfcbfc92e8f2d6865d6b1196fce3
parent9ba27affbd5b9706a269b3c5c17bd9979ee05e28
Merge branch 'newfeatures' into 'master'

Taiga tasks 80, 21

See merge request koha-community-devs-users/kohadocs!119
source/systempreferences.rst