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)
Taiga tasks 80, 21

See merge request koha-community-devs-users/kohadocs!119

1  2 
source/systempreferences.rst

Simple merge