Andreas Fischer 835faff61a Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/10218] Prevent startime from being overwritten by deregister_globals() [ticket/10218] Moving global deregistration, etc. to startup.php Conflicts: phpBB/install/database_update.php		2011-06-15 18:51:45 +02:00
..
file.php	Merge branch 'develop-olympus' into develop	2011-06-15 18:51:45 +02:00
index.htm	removed executable props [Bug #6464]	2008-06-04 15:37:06 +00:00