Marc Alexander 7006db7a2d Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords ...

Conflicts:
	phpBB/includes/functions.php

2013-10-03 10:04:59 +02:00

..

data

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords

2013-10-03 10:04:59 +02:00

tool

[ticket/11700] Fix leftover backslashes in comments

2013-09-16 05:20:27 +02:00

exception.php

[ticket/11700] Fix a few more comments

2013-09-16 04:45:58 +02:00

migration.php

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00