Andreas Fischer 3cc0a4149f Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11789] Remove inline color in memberlist_view

Conflicts:
	phpBB/styles/subsilver2/template/memberlist_view.html

2013-08-18 17:10:26 +02:00

..

adm

Merge remote-tracking branch 'phpbb/develop' into ticket/11574

2013-07-30 01:06:11 +02:00

assets/javascript

…

cache

…

config

…

develop

[ticket/11761] Serve blank file locally in functional test

2013-08-06 12:39:28 -07:00

docs

Merge branch 'develop-olympus' into develop

2013-08-16 18:04:52 +02:00

download

…

files

…

images

…

includes

Merge remote-tracking branch 'cyberalien/ticket/11754' into develop

2013-08-18 01:55:56 +02:00

install

Merge remote-tracking branch 'nickvergessen/ticket/11574' into develop

2013-08-08 13:56:39 +05:30

language

Merge remote-tracking branch 'nickvergessen/ticket/11574' into develop

2013-08-08 13:56:39 +05:30

phpbb

[ticket/11784] Remove naming redundancy for event listeners

2013-08-13 02:14:22 -07:00

store

…

styles

Merge branch 'develop-olympus' into develop

2013-08-18 17:10:26 +02:00

.htaccess

…

app.php

…

common.php

…

composer.json

…

composer.lock

…

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

…

report.php

[ticket/11763] Add missing variable when reporting a PM to avoid SQL Error

2013-08-03 17:30:28 +02:00

search.php

…

ucp.php

…

viewforum.php

…

viewonline.php

…

viewtopic.php

Merge pull request #1630 from brunoais/ticket/11638

2013-07-30 03:27:22 -07:00

web.config

…