Joas Schilling 9a814e21aa Merge branch '3.1.x' ...

Conflicts:
	build/build.xml

2015-12-19 14:23:12 +01:00

..

adm

Merge branch '3.1.x'

2015-12-07 21:42:17 +01:00

assets

[ticket/14310] Put progress percentage inside span and make more visible

2015-12-07 16:51:39 +01:00

bin

…

cache

…

config

[ticket/14359] Fix console.command.reparser.reparse service definition

2015-12-14 22:32:16 +01:00

develop

[ticket/14358] Includes the composer autoloader in create_schema_files.php

2015-12-14 22:13:23 +01:00

docs

Merge branch '3.1.x'

2015-12-12 15:24:29 +01:00

download

…

ext

…

files

…

images

…

includes

[prep-release-3.1.7] Increase version to 3.1.7

2015-12-19 12:21:04 +01:00

install

[prep-release-3.1.7] Increase version to 3.1.7

2015-12-19 12:21:04 +01:00

language

Merge branch '3.1.x'

2015-12-13 11:19:01 +01:00

phpbb

Merge branch '3.1.x'

2015-12-19 14:23:12 +01:00

store

…

styles

[prep-release-3.1.7] Update version to 3.1.7-RC1

2015-12-12 01:31:31 +01:00

.htaccess

…

app.php

…

common.php

…

composer.json

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

2015-12-07 21:33:59 +01:00

composer.lock

[ticket/14341] Update dependencies to Symfony 2.8 stable

2015-12-06 16:21:14 +01:00

cron.php

…

faq.php

…

feed.php

…

index.php

Merge branch '3.1.x'

2015-11-12 09:11:37 +01:00

mcp.php

…

memberlist.php

Merge branch '3.1.x'

2015-11-26 14:45:36 +01:00

posting.php

…

report.php

…

search.php

…

ucp.php

…

viewforum.php

Merge branch '3.1.x'

2015-11-24 21:46:01 +01:00

viewonline.php

…

viewtopic.php

Merge branch '3.1.x'

2015-11-26 14:27:57 +01:00

web.config

…