Marc Alexander 9e117a9eeb Merge branch '3.1.x' ...

Conflicts:
	phpBB/includes/mcp/mcp_post.php

2015-06-26 10:25:10 +02:00

..

adm

Merge pull request #3661 from marc1706/ticket/6466

2015-06-17 10:07:12 +02:00

assets

Merge pull request #3653 from callumacrae/ticket/13882

2015-06-16 12:33:17 +02:00

bin

…

cache

…

config

Merge pull request #3579 from s9e/ticket/13803

2015-06-24 16:58:41 +02:00

develop

Merge pull request #3618 from marc1706/ticket/13832

2015-06-24 16:36:15 +02:00

docs

Merge branch '3.1.x'

2015-06-16 14:32:01 +02:00

download

…

ext

…

files

…

images

…

includes

Merge branch '3.1.x'

2015-06-26 10:25:10 +02:00

install

[prep-release-3.1.5] Update version for final 3.1.5 release

2015-06-14 16:11:22 +02:00

language

…

phpbb

Merge pull request #3579 from s9e/ticket/13803

2015-06-24 16:58:41 +02:00

store

…

styles/prosilver

Merge branch '3.1.x'

2015-06-19 10:39:40 +02:00

.htaccess

…

app.php

…

common.php

…

composer.json

…

composer.lock

[ticket/13921] Fix block BBCodes inside of inline BBCodes

2015-06-13 14:27:12 +02:00

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

Merge pull request #3669 from s9e/ticket/13901

2015-06-24 16:34:53 +02:00

report.php

…

search.php

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

ucp.php

…

viewforum.php

…

viewonline.php

…

viewtopic.php

Merge branch 'ticket/13930' into ticket/13930-master

2015-06-08 15:39:47 +02:00

web.config

…