kondou 92af840a51 Merge branch 'master' into css_cleanup_kondou ... Conflicts: core/css/styles.css settings/templates/personal.php		2013-07-24 20:35:00 +02:00
..
files	Merge branch 'master' into css_cleanup_kondou	2013-07-24 20:35:00 +02:00
files_encryption	[tx-robot] updated from transifex	2013-07-23 02:03:19 -04:00
files_external	use output buffering when including the irods libraries	2013-07-24 16:10:14 +02:00
files_sharing	initialize OC_Defaults in template constructorX	2013-07-24 11:51:21 +02:00
files_trashbin	[tx-robot] updated from transifex	2013-07-14 02:10:41 +02:00
files_versions	fix array access and change variable names according to the coding style	2013-07-12 11:25:40 +02:00
user_ldap	use OC_Defaults directly from the template	2013-07-24 12:04:18 +02:00
user_webdavauth	Merge branch 'master' into more-themable-strings	2013-07-24 09:35:33 +02:00