Merge branch 'martin-t/server.cfg' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 6 Jan 2017 00:29:36 +0000 (00:29 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 6 Jan 2017 00:29:36 +0000 (00:29 +0000)
commit14a780806603fee672fd6b4845ec0e934b0c0f1d
tree4a9fa46275043a0bfbe922dcbf58b1cb3453f1cb
parent4d0c2bf6b697a977d240f3dd60e5209ea63c0954
parent27d12c610d79074b97f5775af2b39ec4e6c09e9b
Merge branch 'martin-t/server.cfg' into 'master'

Mention apropos and cacs in server.cfg

See merge request !20
server/server.cfg