Thomas Müller f950ce82ae Merge branch 'master' into mobile-style ... Conflicts: apps/files/js/files.js apps/files_sharing/css/public.css apps/files_sharing/js/public.js apps/files_sharing/templates/public.php		2014-01-23 00:39:11 +01:00
..
ajax	OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error	2014-01-21 11:32:30 +01:00
appinfo	OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error	2014-01-21 11:32:30 +01:00
css	Merge branch 'master' into mobile-style	2014-01-23 00:39:11 +01:00
js	Merge branch 'master' into mobile-style	2014-01-23 00:39:11 +01:00
l10n	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
lib	Reuse the data retrieved from the cache in checkUpdate	2014-01-20 15:21:21 +01:00
templates	Merge branch 'master' into mobile-style	2014-01-23 00:39:11 +01:00
tests	Removed numRows usage from encryption app	2013-12-19 15:51:24 +01:00
public.php	Merge branch 'master' into mobile-style	2014-01-23 00:39:11 +01:00