Thomas Mueller 2af6d74bc1 Merge branch 'master' into fixing-js-errors-public-link-master ... Conflicts: apps/files/js/files.js apps/files/templates/part.list.php		2013-01-31 23:23:10 +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
index.php	fix merge conflicts	2013-01-28 11:18:04 +01:00
part.breadcrumb.php	Remove ugly indentation	2013-01-13 01:02:11 +01:00
part.list.php	Merge branch 'master' into fixing-js-errors-public-link-master	2013-01-31 23:23:10 +01:00
upgrade.php	Cache: show upgrade progress	2013-01-15 18:13:50 +01:00