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
..
admin.php	initialize OC_Defaults in template constructorX	2013-07-24 11:51:21 +02:00
apps.php	Hide a ghost image on the apps management page	2013-06-28 21:53:56 +03:00
help.php	Merge branch 'master' into fixing-bugtracker-link-master	2013-03-01 23:41:23 +01:00
oauth-required-apps.php	[core] From echo to p	2013-02-27 22:55:39 +01:00
personal.php	Merge branch 'master' into css_cleanup_kondou	2013-07-24 20:35:00 +02:00
settings.php	[core] From echo to p	2013-02-27 22:55:39 +01:00
users.php	Use !== and === in settings.	2013-07-21 13:55:25 +02:00