diff options
author | Andreas Fischer <bantu@phpbb.com> | 2013-07-24 02:45:35 +0200 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2013-07-24 02:45:35 +0200 |
commit | f0516b7d2a0ac0e1fbf6832cfcfde119ad508907 (patch) | |
tree | 362bd27fad2e1fe08e6649b27b3ab4baa247fee6 /phpBB/includes/bbcode.php | |
parent | 7d8e80241c43fa7d0ade4afa2f56d7eb1aa32989 (diff) | |
parent | bf04bfcced7934704e7f2682ee608f490cb3fc76 (diff) | |
download | forums-f0516b7d2a0ac0e1fbf6832cfcfde119ad508907.tar forums-f0516b7d2a0ac0e1fbf6832cfcfde119ad508907.tar.gz forums-f0516b7d2a0ac0e1fbf6832cfcfde119ad508907.tar.bz2 forums-f0516b7d2a0ac0e1fbf6832cfcfde119ad508907.tar.xz forums-f0516b7d2a0ac0e1fbf6832cfcfde119ad508907.zip |
Merge remote-tracking branch 'EXreaction/ticket/11667' into develop
* EXreaction/ticket/11667:
[ticket/11667] Use @inheritdoc
[ticket/11734] Readd accidently removed language strings of forum permissions
[ticket/11667] Make functions abstract in includeasset
[ticket/11667] includeasset should be abstract
Diffstat (limited to 'phpBB/includes/bbcode.php')
0 files changed, 0 insertions, 0 deletions