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

* develop-olympus:
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC2 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.

Conflicts:
	build/build.xml
	phpBB/install/database_update.php

2013-08-01 17:32:32 +02:00

..

adm

[ticket/11713] Do not remove module if it couldn't be deleted

2013-07-18 22:41:23 +02:00

assets/javascript

…

cache

…

config

Merge pull request #1513 from nickvergessen/ticket/11582

2013-07-22 11:28:55 -07:00

develop

Merge branch 'develop-olympus' into develop

2013-07-30 14:15:09 +02:00

docs

Merge branch 'develop-olympus' into develop

2013-08-01 17:32:32 +02:00

download

[ticket/11725] Use new paths for phpbb_class_loader in file.php

2013-07-22 12:47:32 +02:00

files

…

images

…

includes

[prep-release-3.0.12] Bumping version number for 3.0.12-RC2.

2013-08-01 17:26:34 +02:00

install

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

2013-08-01 17:30:21 +02:00

language

Merge branch 'develop-olympus' into develop

2013-07-30 01:47:02 +02:00

phpbb

Merge pull request #1563 from cyberalien/ticket/11688

2013-07-31 08:10:46 -07:00

store

…

styles

Merge branch 'develop-olympus' into develop

2013-07-31 23:40:35 +02:00

.htaccess

…

app.php

…

common.php

…

composer.json

…

composer.lock

…

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

Merge remote-tracking branch 'brunoais/ticket/11656' into develop

2013-07-24 22:14:52 +02:00

posting.php

…

report.php

[ticket/11722] Remove reference assignment for $captcha in report.php

2013-07-22 03:30:27 +02:00

search.php

[ticket/11749] Move event after all template data has been defined

2013-07-29 00:05:31 -07:00

ucp.php

…

viewforum.php

[ticket/11749] PHP Events for viewforum.php

2013-07-27 10:45:40 -07:00

viewonline.php

…

viewtopic.php

Merge pull request #1630 from brunoais/ticket/11638

2013-07-30 03:27:22 -07:00

web.config

…