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
..
3rdparty/Crypt_Blowfish	move 3rdparty dependencies to app	2013-05-21 10:30:24 +02:00
ajax	Merge pull request #7190 from owncloud/appconfig-legacy-apps	2014-02-18 18:10:22 +01:00
appinfo	don't block login forever if we are stuck in the middle of the initial encryption	2014-02-17 10:03:57 +01:00
css	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
files	replacing ownCloud by theme-able name or avoid it's usage	2013-10-29 23:29:16 +01:00
hooks	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00
js	don't block login forever if we are stuck in the middle of the initial encryption	2014-02-17 10:03:57 +01:00
l10n	[tx-robot] updated from transifex	2014-01-08 01:55:41 -05:00
lib	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00
templates	show change password form if key couldn't be decrypted	2013-12-06 12:20:22 +01:00
tests	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00
settings-admin.php	Remove usage of legacy OC_Appconfig	2014-02-13 16:28:49 +01:00
settings-personal.php	Remove usage of legacy OC_Appconfig	2014-02-13 16:28:49 +01:00