Bjoern Schiessle 4d79e7e673 Merge branch 'master' into encryption_improved_error_messages_4617		2013-09-30 15:08:53 +02:00
..
3rdparty/Crypt_Blowfish	move 3rdparty dependencies to app	2013-05-21 10:30:24 +02:00
ajax	no longer enforce log out, but provide useful errors/warnings instead	2013-09-06 12:27:40 +02:00
appinfo	Merge branch 'master' into encryption_improved_error_messages_4617	2013-09-23 10:39:12 +02:00
css	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
files	re-added error.php	2013-09-06 12:27:25 +02:00
hooks	Merge branch 'master' into encryption_improved_error_messages_4617	2013-09-23 10:39:12 +02:00
js	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
l10n	[tx-robot] updated from transifex	2013-09-29 00:03:26 -04:00
lib	Merge branch 'master' into encryption_improved_error_messages_4617	2013-09-30 15:08:53 +02:00
templates	no longer enforce log out, but provide useful errors/warnings instead	2013-09-06 12:27:40 +02:00
tests	Merge pull request #4537 from owncloud/no-realpath	2013-08-22 01:50:31 -07:00
settings-admin.php	reformat code	2013-05-29 23:13:45 +02:00
settings-personal.php	improved documentation of the methods	2013-09-02 11:34:28 +02:00