Merge branch 'patch-2' into 'master'
authorKatrin Fischer <katrin.fischer.83@web.de>
Mon, 26 Jun 2017 19:05:59 +0000 (19:05 +0000)
committerKatrin Fischer <katrin.fischer.83@web.de>
Mon, 26 Jun 2017 19:05:59 +0000 (19:05 +0000)
commit8099a64a3361b4c8cfe4d7d1de7258559e1cccf8
tree5f94eee1688870ad684549ba6e61c21444f7eea6
parent3a3e0eeac3c692bfae855d35906bb675fdf05ada
parent4ba839764459e435cdb3d202e56f452e17a0172e
Merge branch 'patch-2' into 'master'

Included the remainder of the System Preferences added in Koha 16.11

See merge request !14