[ticket/12123] Add soft delete to phpbb/permissions.php.

PHPBB3-12123
[ticket/12118] Add noindex meta tag to subsilver2 view-print templates

PHPBB3-12118
Merge remote-tracking branch 'vinny/ticket/12118' into develop-olympus

* vinny/ticket/12118:
  [ticket/12118] Add noindex meta tag to subsilver2 view-print templates
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
[ticket/12137] Fix spacing in smiley block.

PHPBB3-12137
Merge pull request #1965 from prototech/ticket/12137

[ticket/12137] Fix spacing in smiley block.

* prototech/ticket/12137:
  [ticket/12137] Fix spacing in smiley block.
[ticket/12119] Remove meta tags from view-print templates

PHPBB3-12119
Merge remote-tracking branch 'vinny/ticket/12119' into develop-olympus

* vinny/ticket/12119:
  [ticket/12119] Remove meta tags from view-print templates
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
Merge remote-tracking branch 'prototech/ticket/12123' into develop