Henrik Kjölhede 41fa65e7be Merge branch 'master' of https://github.com/owncloud/core ... Conflicts: apps/files_external/appinfo/app.php		2013-02-09 14:05:33 +07:00
..
3rdparty/phpseclib	Added phpseclib to files_external as 3rdparty	2012-12-27 20:23:56 +07:00
ajax	merge master into filesystem	2012-12-03 18:02:22 +07:00
appinfo	Merge branch 'master' of https://github.com/owncloud/core	2013-02-09 14:05:33 +07:00
css	Fix remove button display for external storage	2012-08-13 17:10:58 +07:00
js	Merge branch 'master' into from_live_to_on	2013-01-31 23:34:12 +07:00
l10n	[tx-robot] updated from transifex	2013-02-05 00:20:29 +07:00
lib	Merge branch 'master' of https://github.com/owncloud/core	2013-02-09 14:05:33 +07:00
templates	Whitespace cleanup	2013-01-16 18:09:16 +07:00
tests	merge master into filesystem	2013-01-26 18:49:45 +07:00
personal.php	merge master into filesystem	2012-12-15 02:21:26 +07:00
settings.php	check if admin	2012-12-17 14:46:57 +07:00