Andreas Fischer 9296c75738 Merge branch '3.1.x' ...

* 3.1.x:
  [ticket/13903] Replacing regexp path naming for container by md5.

Conflicts:
	phpBB/phpbb/di/container_builder.php

2015-06-16 20:06:28 +02:00

..

adm

Merge branch '3.1.x'

2015-06-06 11:44:05 +02:00

assets

Merge pull request #3653 from callumacrae/ticket/13882

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

bin

Merge pull request #3554 from Nicofuma/ticket/13770

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

cache

…

config

[ticket/13777] Deduplicate migration service definitions

2015-05-31 13:22:45 +02:00

develop

Merge branch '3.1.x'

2015-06-09 15:24:08 +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-16 12:35:51 +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

Merge pull request #3383 from nickvergessen/ticket/9109

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

phpbb

Merge branch '3.1.x'

2015-06-16 20:06:28 +02:00

store

…

styles/prosilver

Merge branch '3.1.x'

2015-06-14 17:40:18 +02:00

.htaccess

…

app.php

…

common.php

…

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

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

Merge pull request #3675 from s9e/ticket/13906

2015-06-16 14:34:44 +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

…