Marc Alexander e9601813c1 Merge branch '3.1.x' ...

Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html

2015-05-30 12:41:24 +02:00

..

adm

Merge branch '3.1.x'

2015-03-15 16:59:58 +08:00

assets

Merge pull request #3658 from callumacrae/js-refactoring-again

2015-05-30 12:40:46 +02:00

bin

Merge pull request #3554 from Nicofuma/ticket/13770

2015-05-29 10:56:54 +02:00

cache

…

config

Merge pull request #3613 from nickvergessen/ticket/13844

2015-05-29 15:44:39 +02:00

develop

[ticket/13844] Fix language file so the tests pass

2015-05-16 23:13:50 +02:00

docs

Merge branch '3.1.x'

2015-05-28 12:42:56 +02:00

download

[ticket/13770] Wither interface for container_builder

2015-05-14 23:04:03 +02:00

ext

…

files

…

images

…

includes

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

install

Merge pull request #3554 from Nicofuma/ticket/13770

2015-05-29 10:56:54 +02:00

language

Merge pull request #3383 from nickvergessen/ticket/9109

2015-05-29 16:04:56 +02:00

phpbb

[ticket/13896] Fix coding style

2015-05-30 12:27:31 +02:00

store

…

styles/prosilver

Merge branch '3.1.x'

2015-05-30 12:41:24 +02:00

.htaccess

…

app.php

…

common.php

[ticket/13770] Fix tests

2015-05-14 23:04:23 +02:00

composer.json

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

composer.lock

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

cron.php

…

faq.php

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

Merge pull request #3613 from nickvergessen/ticket/13844

2015-05-29 15:44:39 +02:00

report.php

[ticket/13654] Moving reporting into controller

2015-04-16 11:29:11 +02:00

search.php

…

ucp.php

…

viewforum.php

Merge branch '3.1.x'

2015-03-06 13:45:12 +01:00

viewonline.php

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

viewtopic.php

Merge branch '3.1.x'

2015-05-06 21:47:10 +02:00

web.config

[ticket/13271] Fix URL Rewriting on IIS7

2015-03-23 18:23:12 +01:00