1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Andreas Fischer a38de9a232 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11135] Full replacement of credit link to https

Conflicts:
	phpBB/install/convertors/convert_phpbb20.php
2012-10-06 06:15:01 +02:00
..