Andreas Fischer c9ad0c6f25 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.

Conflicts:
	phpBB/install/database_update.php
	phpBB/ucp.php

2012-10-29 15:16:59 -04:00

..

convertors

Merge branch 'develop-olympus' into develop

2012-10-06 06:15:01 +02:00

data

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

schemas

Merge remote-tracking branch 'EXreaction/ticket/11021' into develop

2012-09-15 17:48:51 +02:00

database_update.php

Merge branch 'develop-olympus' into develop

2012-10-29 15:16:59 -04:00

index.php

Merge branch 'develop-olympus' into develop

2012-10-06 06:15:01 +02:00

install_convert.php

[ticket/11052] constructor updated in installer and convertor

2012-08-15 15:44:01 +05:30

install_install.php

[ticket/10631] Validation for extensions

2012-09-01 15:05:23 +01:00

install_main.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

install_update.php

[ticket/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords.

2012-09-08 14:42:38 +02:00

phpinfo.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00