Nils Adermann 0ef95a7009 Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/11112] Do not change opensource.org link to https [ticket/11112] Use https for user-visible links to phpbb.com Conflicts: phpBB/language/en/install.php phpBB/language/en/ucp.php		2013-07-13 13:16:58 -04:00
..
driver	Merge branch 'develop-olympus' into develop	2013-07-13 13:16:58 -04:00
migration	Merge pull request #1017 from nickvergessen/feature/softdelete-1-permission	2013-07-13 08:57:20 -07:00
db_tools.php	Merge remote-tracking branch 'exreaction/ticket/11350' into develop	2013-02-07 00:56:31 +01:00
index.htm	Moved to includes ... since they are included too .. trying to "clean up" structure a little	2003-03-17 10:54:23 +00:00
migrator.php	Merge remote-tracking branch 'remotes/Blitze/ticket/11383' into develop	2013-03-09 18:33:19 -06:00
sql_insert_buffer.php	[ticket/11469] Add comment about using bitwise operator.	2013-03-28 00:28:51 +01:00