Joas Schilling 677ff632c4 Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/includes/mcp/mcp_queue.php

2015-02-02 23:27:19 +01:00

..

adm

[ticket/13554] Show feature release upgrades in blue rather than red.

2015-01-28 21:59:03 +01:00

assets

…

bin

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

cache

…

config

Merge pull request #3275 from nickvergessen/ticket/13487

2015-01-22 18:16:30 +01:00

develop

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

docs

Merge branch 'develop-ascraeus' into develop

2015-02-02 23:07:33 +01:00

download

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

ext

…

files

…

images

…

includes

Merge branch 'develop-ascraeus' into develop

2015-02-02 23:27:19 +01:00

install

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

language

Merge pull request #3225 from prototech/ticket/13302

2014-12-27 14:12:23 +01:00

phpbb

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

store

…

styles/prosilver

Merge branch 'develop-ascraeus' into develop

2015-02-02 23:07:33 +01:00

.htaccess

…

app.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

common.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

composer.json

…

composer.lock

…

cron.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

faq.php

…

feed.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

index.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

mcp.php

[ticket/13142] Extra space before the comment block

2014-11-29 10:40:35 +00:00

memberlist.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

posting.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

report.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

search.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

ucp.php

[ticket/13468] Update calls to add_log()

2015-01-27 18:34:33 +01:00

viewforum.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

viewonline.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

viewtopic.php

Merge pull request #3289 from MGaetan89/ticket/13450

2015-01-14 12:34:28 +01:00

web.config

…