diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-19 20:37:52 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-19 20:37:52 +0100 |
| commit | 76d7d38dea10d6355e680c448579369ca8bd48d2 (patch) | |
| tree | 1afd18ca861e7073bb76acc15aae38117726fa16 /phpBB/phpbb/tree/nestedset_forum.php | |
| parent | 1af769714304054e63ffaeb41cfa51801785a59d (diff) | |
| parent | bdab6dede016854d65f31ae869924ac9f7e98ce9 (diff) | |
| download | forums-76d7d38dea10d6355e680c448579369ca8bd48d2.tar forums-76d7d38dea10d6355e680c448579369ca8bd48d2.tar.gz forums-76d7d38dea10d6355e680c448579369ca8bd48d2.tar.bz2 forums-76d7d38dea10d6355e680c448579369ca8bd48d2.tar.xz forums-76d7d38dea10d6355e680c448579369ca8bd48d2.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11766] Hide edit, quote and delete buttons if topic is locked
Conflicts:
phpBB/viewtopic.php
Diffstat (limited to 'phpBB/phpbb/tree/nestedset_forum.php')
0 files changed, 0 insertions, 0 deletions