Marc Alexander 5e2ccb2dd7 [ticket/14199] Correctly resolve merge conflicts ...

PHPBB3-14199

2015-10-07 14:38:26 +02:00

..

adm

Merge branch '3.1.x'

2015-09-16 11:58:53 +02:00

assets

[ticket/12769] Fix font permissions

2015-09-17 18:57:33 +02:00

bin

[ticket/14125] Add --env option to all CLI commands

2015-08-24 18:07:37 +02:00

cache

…

config

Merge pull request #3904 from Zoddo/ticket/14162

2015-10-07 14:03:02 +02:00

develop

…

docs

[ticket/14205] Bump PHP requirement to PHP 5.4

2015-10-04 16:19:48 +02:00

download

…

ext

…

files

…

images

…

includes

[ticket/14205] Bump PHP requirement to PHP 5.4

2015-10-04 16:19:48 +02:00

install

[ticket/14205] Bump PHP requirement to PHP 5.4

2015-10-04 16:19:48 +02:00

install_new

…

language

Merge pull request #3904 from Zoddo/ticket/14162

2015-10-07 14:03:02 +02:00

phpbb

Merge pull request #3904 from Zoddo/ticket/14162

2015-10-07 14:03:02 +02:00

store

…

styles

[ticket/14199] Correctly resolve merge conflicts

2015-10-07 14:38:26 +02:00

.htaccess

…

app.php

…

common.php

…

composer.json

[ticket/14205] Bump PHP requirement to PHP 5.4

2015-10-04 16:19:48 +02:00

composer.lock

[ticket/14205] Bump PHP requirement to PHP 5.4

2015-10-04 16:19:48 +02:00

cron.php

…

faq.php

…

feed.php

[ticket/13645] Move the feeds to controllers

2015-08-23 22:36:10 +02:00

index.php

…

mcp.php

…

memberlist.php

…

posting.php

…

report.php

…

search.php

…

ucp.php

…

viewforum.php

…

viewonline.php

…

viewtopic.php

[ticket/12769] Delete imageset & consolidate imgs

2015-09-17 18:37:25 +02:00

web.config

…