Björn Schießle 54eeb8b8fc fix merge conflict		2013-01-31 10:55:59 +01:00
..
ajax	merge master into filesystem	2013-01-30 19:24:24 +01:00
appinfo	change required ownCloud version to 4.91	2013-01-28 19:58:24 +01:00
css	fix merge conflict	2013-01-31 10:55:59 +01:00
js	fix merge conflict	2013-01-31 10:55:59 +01:00
l10n	[tx-robot] updated from transifex	2013-01-31 00:31:28 +01:00
lib	introducing class OCA/files/lib/Helper with new function to build an array with storage stats	2013-01-19 00:31:09 +01:00
templates	fix merge conflict	2013-01-31 10:55:59 +01:00
admin.php	Remove outdated comments	2013-01-26 14:03:17 +01:00
download.php	merge master into filesystem	2013-01-28 19:37:58 +01:00
index.php	fix merge conflict	2013-01-31 10:55:59 +01:00
settings.php	merge master into filesystem	2013-01-28 19:37:58 +01:00