Bjoern Schiessle 534d93d2d3 Merge branch 'master' into sharing_mail_notification_master ... Conflicts: apps/files/index.php		2013-09-16 10:40:06 +02:00
..
admin.php	use css class hidden to hide setting elements	2013-09-02 17:14:11 +02:00
apps.php	Move .errormsg from settings-css to .warning in core. Reusable!	2013-08-18 17:37:22 +02: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	Pass view in \OC_Avatar to constructor and use $_ for enable_avatars	2013-09-09 16:57:46 +02:00
settings.php	[core] From echo to p	2013-02-27 22:55:39 +01:00
users.php	Pass view in \OC_Avatar to constructor and use $_ for enable_avatars	2013-09-09 16:57:46 +02:00