Merge pull request #2305 from nerdoc/patch-1
authorMichael Vogel <icarus@dabo.de>
Tue, 2 Feb 2016 20:07:52 +0000 (21:07 +0100)
committerMichael Vogel <icarus@dabo.de>
Tue, 2 Feb 2016 20:07:52 +0000 (21:07 +0100)
add simple option for HTTPS in .htaccess


Trivial merge