thororm 23f5dfbff8 Merge remote-tracking branch 'remotes/thororm/master' into attachment-handling ...

# Conflicts:
#	tpl/bootstrap.php
#	tpl/page.php

2017-05-13 19:48:25 +02:00

..

.htaccess

updating shipped .htaccess files for Apache 2.4 as per https://httpd.apache.org/docs/2.4/upgrading.html#access - Thanks @EchoDev, fixes #194

2017-03-11 08:56:14 +01:00

conf.ini.sample

Merge remote-tracking branch 'remotes/thororm/master' into attachment-handling

2017-05-13 19:48:25 +02:00