Marc Alexander 11167f6060 Merge branch '3.1.x' ...

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

2015-05-14 15:57:41 +02:00

..

adm

Merge branch '3.1.x'

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

assets

[ticket/13666] Remove data-clicked attribute from all of form's submit buttons

2015-03-05 22:26:13 +01:00

bin

…

cache

…

config

[ticket/13638] Inject $filesystem in \phpbb\template\asset

2015-05-05 17:07:11 +02:00

develop

Merge branch '3.1.x'

2015-05-06 01:14:08 +02:00

docs

Merge branch '3.1.x'

2015-05-14 15:57:41 +02:00

download

…

ext

…

files

…

images

…

includes

Merge pull request #3599 from marc1706/ticket/13825

2015-05-08 17:37:52 +02:00

install

[ticket/13638] Inject $filesystem in \phpbb\template\asset

2015-05-05 17:07:11 +02:00

language

Merge branch '3.1.x'

2015-05-04 10:57:17 +02:00

phpbb

Merge branch '3.1.x'

2015-05-08 11:00:22 +02:00

store

…

styles/prosilver

Merge branch '3.1.x'

2015-05-14 15:57:41 +02:00

.htaccess

…

app.php

…

common.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

composer.json

[ticket/13762] Moving language related functionality into a separate class

2015-05-02 13:37:12 +02:00

composer.lock

Merge pull request #3524 from marc1706/ticket/8672

2015-04-27 16:26:40 +02:00

cron.php

…

faq.php

[ticket/13647] Use the Symfony way for redirecting

2015-02-27 22:58:51 +01:00

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

Merge branch '3.1.x'

2015-04-06 10:59:46 +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

Merge branch '3.1.x'

2015-05-08 11:16:45 +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