Marc Alexander 7d4bbeef3f Merge branch '3.1.x' ...

Conflicts:
	phpBB/phpbb/notification/type/bookmark.php
	phpBB/phpbb/notification/type/post.php
	phpBB/phpbb/notification/type/quote.php

2015-10-17 12:13:32 +02:00

..

method

Merge branch '3.1.x'

2015-08-05 13:45:02 +02:00

type

Merge branch '3.1.x'

2015-10-17 12:13:32 +02:00

exception.php

[ticket/13793] Remove translation on throwing exceptions

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

manager.php

[ticket/14079] Correctly mark notifications as read

2015-08-08 19:18:18 +02:00