diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-12-16 17:51:48 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-12-16 17:51:48 +0100 |
| commit | d42d0972440867e756b8f27841b2ba30b5b69648 (patch) | |
| tree | 450863e503acaa757f5f623e3f3cc2faf774e280 /phpBB/includes/message_parser.php | |
| parent | 124ff6c50a3805aec4410942d2b5aa428bee3ddf (diff) | |
| parent | 74c4b92760daa54e8f65b4881fbfc3970418c539 (diff) | |
| download | forums-d42d0972440867e756b8f27841b2ba30b5b69648.tar forums-d42d0972440867e756b8f27841b2ba30b5b69648.tar.gz forums-d42d0972440867e756b8f27841b2ba30b5b69648.tar.bz2 forums-d42d0972440867e756b8f27841b2ba30b5b69648.tar.xz forums-d42d0972440867e756b8f27841b2ba30b5b69648.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-6632
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10408
[ticket/10504] Revert the changes for widescreen optimisation PHPBB3-10485
Conflicts:
phpBB/styles/prosilver/template/forumlist_body.html
phpBB/styles/prosilver/template/search_results.html
phpBB/styles/prosilver/template/viewforum_body.html
Diffstat (limited to 'phpBB/includes/message_parser.php')
0 files changed, 0 insertions, 0 deletions