diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2016-03-08 22:18:42 +0100 |
|---|---|---|
| committer | Máté Bartus <mate.bartus@gmail.com> | 2016-03-08 22:18:42 +0100 |
| commit | a01e3a0ffa2d9fb4d609317aa5e2caed4c521a68 (patch) | |
| tree | ea7793775abbd1b0f5a052054bcfa3c5e1af7187 /phpBB/phpbb/feed/helper.php | |
| parent | 9d7b6260bd1ef0a0a07af7ec5cd2c1955f31a74c (diff) | |
| parent | 7c45ed0733d525d466ba6d45a13b50e5fc553126 (diff) | |
| download | forums-a01e3a0ffa2d9fb4d609317aa5e2caed4c521a68.tar forums-a01e3a0ffa2d9fb4d609317aa5e2caed4c521a68.tar.gz forums-a01e3a0ffa2d9fb4d609317aa5e2caed4c521a68.tar.bz2 forums-a01e3a0ffa2d9fb4d609317aa5e2caed4c521a68.tar.xz forums-a01e3a0ffa2d9fb4d609317aa5e2caed4c521a68.zip | |
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
Diffstat (limited to 'phpBB/phpbb/feed/helper.php')
0 files changed, 0 insertions, 0 deletions