Marc Alexander 5d091e2d8f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars ...

Conflicts:
	phpBB/includes/ucp/ucp_groups.php

2013-01-04 10:49:57 +01:00

..

file.php

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

2013-01-04 10:49:57 +01:00

index.htm

removed executable props [Bug #6464]

2008-06-04 15:37:06 +00:00