diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-06-10 00:26:41 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-06-10 00:26:41 +0200 |
| commit | 735cae076a2b2814e40dda08b5f4dacf0b408345 (patch) | |
| tree | 1011a958cfcfe84725d2a2a2f0e4894af24d8f0e /phpBB/includes/session.php | |
| parent | da41c754be14147de439fa0cc76bc682a84f7353 (diff) | |
| parent | 5b701dc3ed83345c70eabc1d88a721a7df8e43e5 (diff) | |
| download | forums-735cae076a2b2814e40dda08b5f4dacf0b408345.tar forums-735cae076a2b2814e40dda08b5f4dacf0b408345.tar.gz forums-735cae076a2b2814e40dda08b5f4dacf0b408345.tar.bz2 forums-735cae076a2b2814e40dda08b5f4dacf0b408345.tar.xz forums-735cae076a2b2814e40dda08b5f4dacf0b408345.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/6712] Properly explain result of setting the bump interval to 0.
[ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
[ticket/6712] Pass $post_data by the value instead of by the reference.
[ticket/6712] Bump does not create new topic icon on index.
Conflicts:
phpBB/includes/functions_posting.php
Diffstat (limited to 'phpBB/includes/session.php')
0 files changed, 0 insertions, 0 deletions