Andreas Fischer 4af503e11b Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.
  [develop-olympus] Add changelog for 3.0.11 release.
  [develop-olympus] Bump version numbers for 3.0.11-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.11 releases.

Conflicts:
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg

2012-05-31 23:11:27 +02:00

..

convertors

[develop-olympus] Bumping version numbers to final for 3.0.11 releases.

2012-05-31 20:19:28 +02:00

data

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

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

schemas

[develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.

2012-05-31 22:07:34 +02:00

database_update.php

Merge branch 'develop-olympus' into develop

2012-05-31 23:11:27 +02:00

index.php

[ticket/10756] Renaming phpbb_style_template to phpbb_template

2012-04-19 04:25:25 +02:00

install_convert.php

[ticket/10637] Leftovers from implementation of extensions in convertor

2012-02-09 22:24:46 +02:00

install_install.php

Merge PR #743 branch 'develop-olympus' into develop

2012-05-21 22:13:35 -04: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/10754] Changing $style to $phpbb_style

2012-04-03 00:41:56 +03:00

phpinfo.php

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

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