Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches ... Conflicts: lib/private/migration/content.php		2014-02-18 18:31:33 +01:00
..
ajax	don't urldecode get var, php does this automatically	2014-01-30 16:32:45 +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	Consolidate two sections, per code review. Issue #1648	2014-02-17 12:57:54 -05:00
js	merge master into mobile-style	2014-01-29 10:55:44 +01:00
l10n	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
lib	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00
templates	Fixed double file encoding for previews	2014-01-30 16:34:37 +01:00
tests	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
public.php	Remove usage of legacy OC_Appconfig	2014-02-13 16:28:49 +01:00