server/apps/files_external
Thomas Mueller b1da1db0eb Merge branch 'master' into from_live_to_on
Conflicts:
	apps/files_external/js/google.js
2013-01-31 23:34:12 +01:00
..
ajax merge master into filesystem 2012-12-03 18:02:22 +01:00
appinfo change required ownCloud version to 4.91 2013-01-28 19:58:24 +01:00
css Fix remove button display for external storage 2012-08-13 17:10:58 -04:00
js Merge branch 'master' into from_live_to_on 2013-01-31 23:34:12 +01:00
l10n [tx-robot] updated from transifex 2013-01-31 17:05:21 +01:00
lib remove outdated line 2013-01-31 15:00:48 +01:00
templates Whitespace cleanup 2013-01-16 18:09:16 +01:00
tests merge master into filesystem 2013-01-26 18:49:45 +01: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