Lukas Reschke ae3425d2da Merge branch 'master' into securityutils ... Conflicts: lib/private/util.php		2014-08-31 15:21:09 +02:00
..
.htaccess	if file doesn't exist, check parent folder	2014-06-14 10:14:07 +02:00
config.sample.php	Merge branch 'master' into securityutils	2014-08-31 15:21:09 +02:00