Thomas Müller c216c4777b Merge branch 'master' into close-session-faster-master ... Conflicts: apps/files/ajax/upgrade.php		2014-03-19 11:44:21 +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	clearify the use-case of this app	2014-03-17 12:29:17 +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	don't overwrite keys if rename was done by a stream copy	2014-02-24 17:24:43 +01:00
js	Merge pull request #7174 from owncloud/issue/7166	2014-02-26 14:41:07 +01:00
l10n	[tx-robot] updated from transifex	2014-03-19 01:55:39 -04:00
lib	in case of phpunit executions calling header() and exit() is too bad	2014-03-14 18:20:33 +01:00
templates	show change password form if key couldn't be decrypted	2013-12-06 12:20:22 +01:00
tests	Return unencrypted_size of folder when queried	2014-03-07 14:59:09 +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