diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-07-23 04:24:05 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-23 04:24:05 +0200 |
| commit | 7d8e80241c43fa7d0ade4afa2f56d7eb1aa32989 (patch) | |
| tree | d80b5ec9b416c1f080273e59445a1f44e1634c6c /phpBB/includes/bbcode.php | |
| parent | 1004aaf7877f26685992c89532725296ce7f64d0 (diff) | |
| parent | 1c59ad87b026794e44ce6c7561feabd3eb7bf165 (diff) | |
| download | forums-7d8e80241c43fa7d0ade4afa2f56d7eb1aa32989.tar forums-7d8e80241c43fa7d0ade4afa2f56d7eb1aa32989.tar.gz forums-7d8e80241c43fa7d0ade4afa2f56d7eb1aa32989.tar.bz2 forums-7d8e80241c43fa7d0ade4afa2f56d7eb1aa32989.tar.xz forums-7d8e80241c43fa7d0ade4afa2f56d7eb1aa32989.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11718' into develop
* EXreaction/ticket/11718:
[ticket/11718] Quick test for fixes in ELSEIF
[ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF
Conflicts:
tests/template/template_test.php
Diffstat (limited to 'phpBB/includes/bbcode.php')
0 files changed, 0 insertions, 0 deletions