Thomas Mueller 07b3b23a39 Merge branch 'master' into fixing-998-master ... Conflicts: apps/files/js/files.js		2013-01-06 22:28:21 +01:00
..
ajax	Files: prevent people from renaming files to '.'	2013-01-05 03:30:05 +01:00
appinfo
css	fix switched values from previous commit	2012-12-20 13:30:57 +01:00
js	Merge branch 'master' into fixing-998-master	2013-01-06 22:28:21 +01:00
l10n	[tx-robot] updated from transifex	2013-01-05 00:03:58 +01:00
templates	Merge branch 'master' into fixing-998-master	2013-01-06 10:36:14 +01:00
admin.php	only show the max possible upload of 2GB on a 32 bit system.	2012-12-28 22:17:38 +01:00
download.php
index.php	make usedSpacePercent available in the files app	2013-01-02 15:06:49 +01:00
settings.php