Andreas Fischer 5f73cdcdc2 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [prep-release-3.0.9] Update Changelog for 3.0.9 release.
  [prep-release-3.0.9] Bumping version number for the final 3.0.9 release.
  [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.
  [ticket/10247] Add a db_tools test for the removal of a primary key column.
  [ticket/10247] Add empty data section to database update for RC4
  [ticket/10247] Remove unecessary attempt_id primary key column

Conflicts:
	phpBB/install/database_update.php

2011-07-05 01:07:22 +02:00

..

adm

Merge remote-tracking branch 'naderman/ticket/10198' into develop-olympus

2011-06-10 01:23:17 +02:00

cache

…

develop

Merge branch 'develop-olympus' into develop

2011-07-05 01:07:22 +02:00

docs

Merge branch 'develop-olympus' into develop

2011-07-05 01:07:22 +02:00

download

Merge branch 'develop-olympus' into develop

2011-06-15 18:51:45 +02:00

files

…

images

…

includes

[prep-release-3.0.9] Bumping version number for the final 3.0.9 release.

2011-07-05 00:40:45 +02:00

install

Merge branch 'develop-olympus' into develop

2011-07-05 01:07:22 +02:00

language

Merge branch 'develop-olympus' into develop

2011-06-22 02:32:45 +02:00

store

…

styles

Merge branch 'develop-olympus' into develop

2011-06-26 20:42:06 +02:00

.htaccess

…

common.php

Merge branch 'develop-olympus' into develop

2011-06-15 18:51:45 +02:00

cron.php

…

faq.php

…

feed.php

…

index.php

[ticket/10173] Use correct variable, checking for $birthday_year was correct.

2011-05-11 11:21:37 +02:00

mcp.php

…

memberlist.php

…

posting.php

Merge branch 'develop-olympus' into develop

2011-06-10 00:26:41 +02:00

report.php

…

search.php

…

style.php

Merge branch 'develop-olympus' into develop

2011-06-15 18:51:45 +02:00

ucp.php

Merge branch 'develop-olympus' into develop

2011-05-13 01:29:57 +02:00

viewforum.php

Merge branch 'develop-olympus' into develop

2011-06-19 17:58:16 +02:00

viewonline.php

…

viewtopic.php

Merge branch 'develop-olympus' into develop

2011-06-19 17:58:16 +02:00

web.config

[ticket/10219] Remove invalid and invisible character from web.config.

2011-06-14 23:18:33 +02:00