Andreas Fischer 9713f52fc6 Merge branch '3.1.x' ...

* 3.1.x:
  [ticket/13923] CS
  [ticket/13923] Update startup.php

2015-06-09 21:27:56 +02:00

..

adm

Merge branch '3.1.x'

2015-06-06 11:44:05 +02:00

assets

Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.x

2015-05-31 16:56:44 +02:00

bin

Merge pull request #3554 from Nicofuma/ticket/13770

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

cache

…

config

[ticket/13777] Deduplicate migration service definitions

2015-05-31 13:22:45 +02:00

develop

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

docs

Merge branch '3.1.x'

2015-06-04 17:46:36 +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-06-09 21:27:56 +02:00

install

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

language

Merge pull request #3383 from nickvergessen/ticket/9109

2015-05-29 16:04:56 +02:00

phpbb

Merge pull request #3696 from marc1706/ticket/13930-master

2015-06-09 21:27:23 +02:00

store

…

styles/prosilver

[ticket/13902] Increased CSS margin around quotes

2015-06-07 06:57:59 +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

Merge branch '3.1.x'

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

cron.php

…

faq.php

[ticket/13844] FAQ in new controller format

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

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

Merge branch '3.1.x'

2015-06-08 17:59:49 +02:00

report.php

…

search.php

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

ucp.php

…

viewforum.php

…

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

…