Igor Wiedler 8f0e9aee5c Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10038] Use request_var() in the avatar code path of download/file.php

Conflicts:
	phpBB/download/file.php

2011-02-12 19:55:23 +01:00

..

file.php

Merge branch 'develop-olympus' into develop

2011-02-12 19:55:23 +01:00

index.htm

removed executable props [Bug #6464]

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