Thomas Mueller a814361ca7 Merge branch 'master' into external_storage_ui_feedback		2013-02-12 23:01:54 +01:00
..
3rdparty/phpseclib	Updated phpseclib from git + requested style changes	2013-02-10 12:35:49 +01:00
ajax	Merge branch 'master' into external_storage_ui_feedback	2013-02-12 23:01:54 +01:00
appinfo	Merge branch 'master' of https://github.com/owncloud/core	2013-02-09 14:05:33 +01:00
css	Show status icons for mount points in external storage UI	2012-12-24 13:45:52 -05:00
img	Show status icons for mount points in external storage UI	2012-12-24 13:45:52 -05:00
js	Merge branch 'master' into external_storage_ui_feedback	2013-02-11 20:27:05 -05:00
l10n	[tx-robot] updated from transifex	2013-02-12 15:12:46 +01:00
lib	Merge branch 'master' into external_storage_ui_feedback	2013-02-12 23:01:54 +01:00
templates	Merge branch 'master' into external_storage_ui_feedback	2013-02-12 11:01:14 +01:00
tests	Merge pull request #1030 from hkjolhede/master	2013-02-10 05:06:00 -08:00
personal.php	merge master into filesystem	2012-12-15 02:21:26 +01:00
settings.php	check if admin	2012-12-17 14:46:57 +01:00