Marc Alexander 1aae72961a Merge branch 'develop' into feature/avatars ...

Conflicts:
	phpBB/install/database_update.php

2012-12-09 21:02:31 +01:00

..

images

Merge branch 'develop-olympus' into develop

2012-07-01 00:20:04 +02:00

style

Merge branch 'develop' into feature/avatars

2012-12-09 21:02:31 +01:00

index.php

[ticket/11112] updating links to phpbb.com to use SSL

2012-10-01 15:38:16 +02:00

swatch.php

[ticket/11139] Adding the $phpbb_admin_path variable

2012-10-15 14:32:49 -03:00