Andreas Fischer 441db59db0 Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/12987] Cleanup the services.yml file

Conflicts:
	phpBB/config/services.yml

2014-10-07 00:52:00 +02:00

..

adm

Merge pull request #2844 from marc1706/ticket/12858

2014-09-24 13:47:59 +02:00

assets

Merge pull request #2844 from marc1706/ticket/12858

2014-09-24 13:47:59 +02:00

bin

…

cache

…

config

Merge branch 'develop-ascraeus' into develop

2014-10-07 00:52:00 +02:00

develop

…

docs

Merge branch 'develop-ascraeus' into develop

2014-10-06 22:22:05 +02:00

download

[ticket/13061] Replace the service event.subscriber_loader by a compiler pass

2014-09-13 14:34:18 +02:00

ext

…

files

…

images

…

includes

Merge branch 'develop-ascraeus' into develop

2014-10-06 23:45:18 +02:00

install

Merge branch 'develop-ascraeus' into develop

2014-10-06 23:35:35 +02:00

language

Merge pull request #2307 from PayBas/ticket/12408

2014-10-06 23:43:27 +02:00

phpbb

Merge branch 'develop-ascraeus' into develop

2014-10-06 23:21:35 +02:00

store

…

styles/prosilver

Merge branch 'develop-ascraeus' into develop

2014-10-06 22:22:05 +02:00

.htaccess

…

app.php

…

common.php

…

composer.json

[ticket/13130] Updates dependencies to Symfony 2.5

2014-10-04 21:16:12 +02:00

composer.lock

[ticket/13130] Updates dependencies to Symfony 2.5

2014-10-04 21:16:12 +02:00

cron.php

…

faq.php

…

feed.php

[ticket/13045] Remove Pragma headers

2014-09-17 20:10:01 +02:00

index.php

…

mcp.php

…

memberlist.php

…

posting.php

[ticket/13123] Add events to allow modifying post data

2014-10-01 00:13:37 +02:00

report.php

…

search.php

Merge pull request #2978 from blitze/ticket/13071

2014-10-01 10:01:09 +02:00

ucp.php

…

viewforum.php

[ticket/13062] Fix name of "ORDER_BY" key in SQL array

2014-09-19 00:56:16 +02:00

viewonline.php

[ticket/13051] Fix core event name

2014-09-09 13:12:29 -07:00

viewtopic.php

Merge pull request #2888 from Nicofuma/ticket/12993

2014-10-01 10:19:24 +02:00

web.config

…