Henrik Kjölhede b1b2eafa50 Merge remote-tracking branch 'upstream/master' ... Conflicts: apps/files_external/lib/config.php		2013-01-26 21:51:18 +01:00
..
3rdparty/phpseclib	Added phpseclib to files_external as 3rdparty	2012-12-27 20:23:56 +01:00
ajax	fix checkstyle for files_external app, add whitespace for readability	2012-11-30 16:27:11 +01:00
appinfo	Update apps/files_external/appinfo/app.php	2012-12-26 18:00:04 +01:00
css	Fix remove button display for external storage	2012-08-13 17:10:58 -04:00
js	fix checkstyle for files_external app, add whitespace for readability	2012-11-30 16:27:11 +01:00
l10n	[tx-robot] updated from transifex	2013-01-23 00:06:18 +01:00
lib	Merge remote-tracking branch 'upstream/master'	2013-01-26 21:51:18 +01:00
templates	Whitespace cleanup	2013-01-16 18:09:16 +01:00
tests	drop SimpleTest compatibility	2013-01-24 16:47:17 +01:00
personal.php	Fix "No space found after comma in function call"	2012-12-15 00:43:46 +01:00
settings.php	check if admin	2012-12-17 14:46:57 +01:00