Nils Adermann 0ef95a7009 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11112] Do not change opensource.org link to https
  [ticket/11112] Use https for user-visible links to phpbb.com

Conflicts:
	phpBB/language/en/install.php
	phpBB/language/en/ucp.php

2013-07-13 13:16:58 -04:00

..

en

Merge branch 'develop-olympus' into develop

2013-07-13 13:16:58 -04:00

index.htm

…