Marc Alexander 01097a24b5 Merge branch '3.1.x' ...

Conflicts:
	tests/template/template_includecss_test.php

2015-07-08 22:54:26 +02:00

..

adm

Merge branch '3.1.x'

2015-06-27 14:57:30 +02:00

assets

[ticket/10620] Add more whitespace to long quotes in JS

2015-06-25 22:51:43 +02:00

bin

Merge pull request #3554 from Nicofuma/ticket/13770

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

cache

…

config

Merge pull request #3623 from s9e/ticket/10620

2015-07-07 09:46:36 +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-07-08 22:54:26 +02:00

download

[ticket/13770] Wither interface for container_builder

2015-05-14 23:04:03 +02:00

ext

…

files

…

images

…

includes

Merge branch '3.1.x'

2015-07-08 22:54:26 +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

[ticket/13987] Add --dry-run option to reparser CLI

2015-07-06 23:45:20 +02:00

phpbb

Merge branch '3.1.x'

2015-07-08 22:54:26 +02:00

store

…

styles/prosilver

Merge branch '3.1.x'

2015-07-07 10:46:51 +02:00

.htaccess

…

app.php

…

common.php

[ticket/13770] Fix tests

2015-05-14 23:04:23 +02:00

composer.json

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

composer.lock

[ticket/13985] Updated s9e\TextFormatter

2015-07-06 01:15:18 +02:00

cron.php

[ticket/13455] Update calls to request_var()

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

faq.php

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

feed.php

[ticket/13455] Update calls to request_var()

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

index.php

…

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 pull request #3623 from s9e/ticket/10620

2015-07-07 09:46:36 +02:00

report.php

[ticket/13654] Moving reporting into controller

2015-04-16 11:29:11 +02:00

search.php

Merge branch '3.1.x'

2015-06-09 15:24:08 +02: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/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

viewtopic.php

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

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

web.config

[ticket/13271] Fix URL Rewriting on IIS7

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