Marc Alexander 2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars ...

Conflicts:
	phpBB/adm/style/acp_groups.html
	phpBB/adm/style/acp_users_avatar.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_display.php
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/styles/prosilver/template/ucp_avatar_options.html

2012-11-12 14:57:28 +01:00

..

images

Merge branch 'develop-olympus' into develop

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

style

Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars

2012-11-12 14:57:28 +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