Andreas Fischer 0cee35aeef Merge branch 'ticket/12429' into ticket/12429-develop ...

* ticket/12429:
  [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock

2014-05-02 20:28:58 +02:00

..

adm

Merge remote-tracking branch 'github-rxu/ticket/12403' into develop-ascraeus

2014-05-02 13:35:01 +02:00

assets

Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus

2014-05-02 18:29:50 +02:00

bin

[ticket/12473] Add more compatibility to phpBB Console Application.

2014-05-02 19:01:56 +02:00

cache

…

config

[ticket/12473] Add console command for database migration.

2014-05-02 19:07:46 +02:00

develop

[feature/sqlite3] Add support for SQLite 3

2014-05-02 15:45:20 +02:00

docs

Merge branch 'develop-olympus' into develop-ascraeus

2014-05-02 18:51:59 +02:00

download

…

files

…

images

…

includes

Merge remote-tracking branch 'github-bantu/ticket/12473' into develop-ascraeus

2014-05-02 19:16:52 +02:00

install

[feature/sqlite3] Add support for SQLite 3

2014-05-02 15:45:20 +02:00

language

Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus

2014-05-02 18:29:50 +02:00

phpbb

Merge pull request #2381 from Nicofuma/ticket/12475

2014-05-02 19:50:05 +02:00

store

…

styles

Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus

2014-05-02 18:29:50 +02:00

.htaccess

…

app.php

…

common.php

[ticket/12473] Move compatibility globals out into its own file.

2014-05-02 19:01:26 +02:00

composer.json

Merge branch 'ticket/12429' into ticket/12429-develop

2014-05-02 20:28:58 +02:00

composer.lock

Merge branch 'ticket/12429' into ticket/12429-develop

2014-05-02 20:28:58 +02:00

cron.php

…

faq.php

…

feed.php

[ticket/12413] Fatal Error for feed.php?mode=forums

2014-05-02 13:25:33 +02:00

index.php

Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus

2014-05-02 12:22:05 +02:00

mcp.php

Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus

2014-05-02 12:22:05 +02:00

memberlist.php

Merge remote-tracking branch 'github-exreaction/ticket/8323' into develop-ascraeus

2014-05-02 15:54:10 +02:00

posting.php

[ticket/12273] Update since version to 3.1.0-a* style

2014-04-25 12:15:44 +02:00

report.php

[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.

2014-04-29 17:51:21 +02:00

search.php

Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus

2014-05-02 12:22:05 +02:00

ucp.php

[ticket/12273] Update since version to 3.1.0-a* style

2014-04-25 12:15:44 +02:00

viewforum.php

Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus

2014-05-02 12:22:05 +02:00

viewonline.php

[feature/sqlite3] Add support for SQLite 3

2014-05-02 15:45:20 +02:00

viewtopic.php

Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus

2014-05-02 18:29:50 +02:00

web.config

…