diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-03-06 07:39:17 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-03-06 07:39:17 +0100 |
| commit | d0d9005166d0647f2b6784b2391e7213f9a4447a (patch) | |
| tree | 69ecccc67e77885e18b3fc79c7faf4703b1d856c /phpBB/includes/acp/acp_main.php | |
| parent | 923c0709dbd44f68d76979298cf7d2c732e19494 (diff) | |
| parent | 597c16a9363858e343480f70b1852bce2bba5ca3 (diff) | |
| download | forums-d0d9005166d0647f2b6784b2391e7213f9a4447a.tar forums-d0d9005166d0647f2b6784b2391e7213f9a4447a.tar.gz forums-d0d9005166d0647f2b6784b2391e7213f9a4447a.tar.bz2 forums-d0d9005166d0647f2b6784b2391e7213f9a4447a.tar.xz forums-d0d9005166d0647f2b6784b2391e7213f9a4447a.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11402] Fix undefined index in post/topic_in_queue
[ticket/11400] If email is disabled, disable it for notifications
Diffstat (limited to 'phpBB/includes/acp/acp_main.php')
0 files changed, 0 insertions, 0 deletions