Marc Alexander 80db259ab9 Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	phpBB/phpbb/notification/manager.php

2016-05-27 22:13:35 +02:00

..

method

Merge branch '3.1.x' into 3.2.x

2016-03-13 20:24:41 +01:00

type

[ticket/14648] Remove whitespace at the end of a line

2016-05-25 18:28:07 -04:00

exception.php

[ticket/13793] Remove translation on throwing exceptions

2015-05-01 12:40:53 +02:00

manager.php

Merge branch '3.1.x' into 3.2.x

2016-05-27 22:13:35 +02:00