Máté Bartus a01e3a0ffa Merge branch '3.1.x' into 3.2.x ...

* 3.1.x:
  [ticket/14132] Use transaction for adding notifications to type table
  [ticket/14519] Skip query if all unread notifications are retrieved
  [ticket/14483] Do not send headers by default on access via controller

Conflicts:
	phpBB/phpbb/notification/manager.php

2016-03-08 22:18:42 +01:00

..

exception.php

[ticket/13793] Remove translation on throwing exceptions

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

helper.php

Merge branch '3.1.x' into 3.2.x

2016-03-08 22:18:42 +01:00

resolver.php

[ticket/13793] Remove translation on throwing exceptions

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