Joas Schilling 370fce1651 Merge branch '3.1.x' ...

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

2015-04-06 14:27:48 +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

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

cache

…

config

Merge pull request #3461 from s9e/ticket/11768

2015-04-05 23:32:38 +02:00

develop

Merge branch 'develop-ascraeus' into develop

2015-02-11 16:53:25 +01:00

docs

Merge branch '3.1.x'

2015-04-06 14:27:48 +02:00

download

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

ext

…

files

…

images

…

includes

Merge branch '3.1.x'

2015-04-06 11:31:58 +02:00

install

Merge branch '3.1.x'

2015-04-06 11:49:18 +02:00

language

Merge branch '3.1.x'

2015-02-20 20:53:03 +01:00

phpbb

Merge branch '3.1.x'

2015-04-06 11:36:04 +02:00

store

…

styles/prosilver

Merge branch '3.1.x'

2015-04-06 14:27:48 +02:00

.htaccess

…

app.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

common.php

[ticket/13407] Bump minimal version to php 5.3.9

2015-02-04 17:40:18 +01:00

composer.json

[ticket/11768] Re-added the code that got lost in rebase

2015-04-02 19:16:01 +02:00

composer.lock

[ticket/11768] Updated s9e\TextFormatter

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

cron.php

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

faq.php

[ticket/13647] Use the Symfony way for redirecting

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

feed.php

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

index.php

[ticket/13450] Type-hint return value of $phpbb_container->get()

2015-01-12 20:19:07 +01:00

mcp.php

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

2015-02-03 20:50:40 +01:00

memberlist.php

[ticket/13455] Remove request_var() references from comments

2015-02-03 20:56:48 +01:00

posting.php

Merge branch '3.1.x'

2015-04-06 10:59:46 +02:00

report.php

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

2015-02-03 20:50:40 +01:00

search.php

Merge branch '3.1.x'

2015-02-18 18:04:46 +01:00

ucp.php

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

viewforum.php

Merge branch '3.1.x'

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

viewonline.php

[ticket/13647] Switch FAQ handling in view online to controller

2015-02-22 22:57:14 +01:00

viewtopic.php

Merge branch '3.1.x'

2015-02-18 18:04:46 +01:00

web.config

[ticket/13271] Fix URL Rewriting on IIS7

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