diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-01-26 20:51:55 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-01-26 20:51:55 +0100 |
| commit | 9b500538e3e5d49c29fc5c28bee5ab0e8c91f084 (patch) | |
| tree | c68c97ba2b64435137a7da4951148abb424d48ba /tests | |
| parent | e91a45df33d3ea5d8e181a1a775c2e87cc4d2f47 (diff) | |
| parent | 0d6e587fda5d20477e0d44273928ccf250b43246 (diff) | |
| download | forums-9b500538e3e5d49c29fc5c28bee5ab0e8c91f084.tar forums-9b500538e3e5d49c29fc5c28bee5ab0e8c91f084.tar.gz forums-9b500538e3e5d49c29fc5c28bee5ab0e8c91f084.tar.bz2 forums-9b500538e3e5d49c29fc5c28bee5ab0e8c91f084.tar.xz forums-9b500538e3e5d49c29fc5c28bee5ab0e8c91f084.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12118] Add noindex meta tag to subsilver2 view-print templates
Conflicts:
phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
phpBB/styles/subsilver2/template/viewtopic_print.html
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions