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

* develop-olympus:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/install/database_update.php

2012-08-20 16:42:41 +02:00

..

webpi

…

build_changelog.php

[ticket/9916] Changing header in non-distributed files

2012-01-02 16:20:30 +00:00

build_diff.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

build_helper.php

[ticket/9916] Changing header in non-distributed files

2012-01-02 16:20:30 +00:00

build.xml

Merge branch 'prep-release-3.0.11' into develop-olympus

2012-08-20 16:40:50 +02:00

compare.sh

…

diff_class.php

[ticket/9916] Changing header in non-distributed files

2012-01-02 16:20:30 +00:00

package.php

[ticket/9916] Changing header in non-distributed files

2012-01-02 16:20:30 +00:00

phpdoc-phpbb.ini

…