thororm 096f07f86e Merge branch 'master' into attachment-handling ... # Conflicts: # js/privatebin.js # tpl/bootstrap.php # tpl/page.php		2017-04-02 13:30:52 +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	Update conf.ini.sample	2017-02-13 22:57:09 +01:00