Thomas Müller 15d1df055b Merge branch 'master' into display-share-owner-master ... Conflicts: apps/files_sharing/lib/cache.php		2014-02-28 14:54:10 +01:00
..
ajax	Update rawlist to work with new fileinfo object	2014-02-27 14:04:19 +01:00
appinfo	Merge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_prefixing_master	2014-02-19 11:58:48 +01:00
command	Load authentication apps to get users from all backends - fixes #7019	2014-02-05 12:54:31 +01:00
css	fix too much distance between text and icon	2014-02-21 14:10:13 +01:00
js	coding style fixes, cut long lines, comments not on same lines, curly braces	2014-02-26 10:16:54 +01:00
l10n
lib	Fix svg icons for public shares and external/shared files	2014-02-19 15:08:05 +01:00
templates	Merge branch 'master' into display-share-owner-master	2014-02-28 14:54:10 +01:00
tests	Make unit tests expect the svg icons	2014-02-20 16:56:09 +01:00
admin.php
download.php
index.php	Merge pull request #7257 from owncloud/filelist-fileinfo	2014-02-19 09:40:11 +01:00
settings.php
triggerupdate.php