diff options
author | Andreas Fischer <bantu@phpbb.com> | 2014-01-27 20:48:28 +0100 |
---|---|---|
committer | Andreas Fischer <bantu@phpbb.com> | 2014-01-27 20:48:28 +0100 |
commit | 5553f33f3dfbf309decfafceeb3c145f37aa23e3 (patch) | |
tree | 3ccada27762532fe5b9d2a5f5cd69537f2ff83f3 /phpBB/phpbb/feed | |
parent | 578d5abbf3e13c45cde0477b78bece02cbdd133c (diff) | |
parent | 917a61832ef28da40294abdb88217dc808605180 (diff) | |
download | forums-5553f33f3dfbf309decfafceeb3c145f37aa23e3.tar forums-5553f33f3dfbf309decfafceeb3c145f37aa23e3.tar.gz forums-5553f33f3dfbf309decfafceeb3c145f37aa23e3.tar.bz2 forums-5553f33f3dfbf309decfafceeb3c145f37aa23e3.tar.xz forums-5553f33f3dfbf309decfafceeb3c145f37aa23e3.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12119] Remove meta tags from view-print templates
Conflicts:
phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html
phpBB/styles/prosilver/template/viewtopic_print.html
Diffstat (limited to 'phpBB/phpbb/feed')
0 files changed, 0 insertions, 0 deletions