Code commits

phpBB Master

Marc 21 Oct 2019 b7fe147da82181f2d29df62c0cd43e8bb5bc78b3

Merge branch '3.3.x'
Marc 21 Oct 2019 b0b3810aab2474fdd7ea93c98da0ef01c9958dfd m

Merge branch '3.2.x' into 3.3.x
Marc 21 Oct 2019 fa18778c913dc1fafc6baaadf42def2bab4dc248 m

Merge pull request #5711 from kasimi/ticket/16183
[ticket/16183] Add core.generate_smilies_count_sql_before
Marc 21 Oct 2019 d19df7063597c8dda4c6114d9f3ebdb6c67777a2

Merge branch '3.3.x'
Marc 21 Oct 2019 a8fb843ded90590f1dd38d7ee16ac730d0d51bb2 m

Merge branch '3.2.x' into 3.3.x
Marc 21 Oct 2019 6e757eea94b93cacf4db195e4c90b0ceffc43563 m

Merge pull request #5674 from JoshyPHP/ticket/16147
[ticket/16147] Updated tokens legend in BBCodes ACP
kasimi <mail@kasimi.net> 20 Oct 2019 6df8b7f3678ba242480a0c50b651b1653a0d2d6b m

[ticket/16183] Generate SQL query from array
PHPBB3-16183
- phpBB/includes/functions_posting.php (version 6df8b7f3678ba242480a0c50b651b1653a0d2d6b)
kasimi <mail@kasimi.net> 17 Oct 2019 84e0f5a2ebf8477a70c185c6496a02f0e2ed8918 m

[ticket/16183] Add core.generate_smilies_count_sql_before
PHPBB3-16183
- phpBB/includes/functions_posting.php (version 84e0f5a2ebf8477a70c185c6496a02f0e2ed8918)
JoshyPHP <s9e.dev@gmail.com> 04 Sep 2019 6f6b8d046bfbfde096175c2defa233002d7a9d4a m

[ticket/16147] Updated tokens legend in BBCodes ACP
PHPBB3-16147
- phpBB/language/en/acp/posting.php (version 6f6b8d046bfbfde096175c2defa233002d7a9d4a)