Marc Alexander 87ca5ef7e5 Merge branch '3.1.x' ...

Conflicts:
	phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
	phpBB/styles/subsilver2/theme/stylesheet.css

2015-03-05 14:23:50 +01:00

..

adm

[ticket/13455] Update calls to request_var()

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

assets

…

bin

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

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

cache

…

config

[ticket/10748] Fix class type hinting

2015-02-15 17:01:20 +01:00

develop

Merge branch 'develop-ascraeus' into develop

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

docs

Merge branch '3.1.x'

2015-02-27 22:10:27 +01: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-02-27 12:21:46 +01:00

install

[ticket/13497] Update calls to get_tables()

2015-02-11 21:28:11 +01:00

language

Merge branch '3.1.x'

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

phpbb

Merge branch '3.1.x'

2015-02-27 22:47:02 +01:00

store

…

styles/prosilver

Merge branch '3.1.x'

2015-03-05 14:23:50 +01: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/13407] Bump minimal version to php 5.3.9

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

composer.lock

[ticket/13407] Update composer.lock file

2015-02-04 17:48:10 +01:00

cron.php

[ticket/13455] Update calls to request_var()

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

faq.php

Merge branch '3.1.x'

2015-02-18 21:11:04 +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

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

2015-02-03 20:50:40 +01: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

[ticket/13455] Update calls to request_var()

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

viewonline.php

[ticket/13455] Update calls to request_var()

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

viewtopic.php

Merge branch '3.1.x'

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

web.config

…