diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-08-25 23:16:31 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-08-25 23:16:31 -0400 |
| commit | 459570bcca9347f4f115e0e53d098b4ebd4ffc1a (patch) | |
| tree | 9fce9dd270161b63a25094c89617567f0ac1fcff /phpBB/includes/session.php | |
| parent | 28f72e427e61d2aa4ba4e5c5722c3e98469a16e1 (diff) | |
| parent | d602f748663ea1b726bbf2614e4d54ee5da309b1 (diff) | |
| download | forums-459570bcca9347f4f115e0e53d098b4ebd4ffc1a.tar forums-459570bcca9347f4f115e0e53d098b4ebd4ffc1a.tar.gz forums-459570bcca9347f4f115e0e53d098b4ebd4ffc1a.tar.bz2 forums-459570bcca9347f4f115e0e53d098b4ebd4ffc1a.tar.xz forums-459570bcca9347f4f115e0e53d098b4ebd4ffc1a.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9995] Do not run forum SQL query when marking the whole board read.
[ticket/9995] Always continue when harvesting $forum_ids for markread().
[ticket/9995] Remove useless statement from display_forums()
Conflicts:
phpBB/includes/functions_display.php
Diffstat (limited to 'phpBB/includes/session.php')
0 files changed, 0 insertions, 0 deletions