Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches ... Conflicts: lib/private/migration/content.php		2014-02-18 18:31:33 +01:00
..
3rdparty	Now using SFTP stream wrapper from phpseclib	2014-01-23 12:43:12 +01:00
ajax	fixing dropbox require path	2013-11-05 10:33:21 +01:00
appinfo	Merge pull request #5238 from owncloud/externalstorage-owncloudbackend	2014-01-08 01:49:15 -08:00
css	Merge branch 'master' into core-em-to-px	2014-01-16 14:42:37 +05:30
js	Fixed Dropbox/Google storage async save call	2013-12-06 17:25:09 +01:00
l10n	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
lib	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00
templates	Fixed placeholder after page reload	2013-12-03 12:26:08 +01:00
tests	Merge pull request #5238 from owncloud/externalstorage-owncloudbackend	2014-01-08 01:49:15 -08:00
personal.php	[files_external] From echo to p	2013-02-27 21:31:27 +01:00
settings.php	Files External: show display names instead of internal user names in Settings UI	2013-03-27 19:07:33 +01:00