1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11135] Full replacement of credit link to https

Conflicts:
	phpBB/install/convertors/convert_phpbb20.php
This commit is contained in:
Andreas Fischer
2012-10-06 06:15:01 +02:00
10 changed files with 10 additions and 10 deletions

View File

@@ -3,7 +3,7 @@
Style name: prosilver (the default phpBB 3.1.x style)
Based on style:
Original author: Tom Beddard ( http://www.subblue.com/ )
Modified by: phpBB Group ( http://www.phpbb.com/ )
Modified by: phpBB Group ( https://www.phpbb.com/ )
--------------------------------------------------------------
*/