Lukas Reschke fadb11253b Merge branch 'master' into fixing-bugtracker-link-master ... Conflicts: core/templates/exception.php settings/templates/help.php		2013-03-01 23:41:23 +01:00
..
admin.php	[core] From echo to p	2013-02-27 22:55:39 +01:00
apps.php	[core] From echo to p	2013-02-27 22:55:39 +01: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	[core] From echo to p	2013-02-27 22:55:39 +01:00
settings.php	[core] From echo to p	2013-02-27 22:55:39 +01:00
users.php	[core] From echo to p	2013-02-27 22:55:39 +01:00