Nathaniel Guse c1840c78c5 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3 ...

Conflicts:
	phpBB/includes/db/migrator.php

2013-03-04 13:48:29 -06:00

..

adm

Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop

2013-03-04 13:33:42 -06:00

assets/javascript

…

cache

…

config

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3

2013-03-04 13:48:29 -06:00

develop

Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop

2013-03-04 13:33:42 -06:00

docs

…

download

…

files

…

images

…

includes

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3

2013-03-04 13:48:29 -06:00

install

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11386-3

2013-03-04 13:48:29 -06:00

language

Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop

2013-03-04 13:33:42 -06:00

store

…

styles

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars

2013-03-04 00:22:15 +01:00

.htaccess

…

app.php

…

common.php

…

composer.json

…

composer.lock

…

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop

2013-03-04 13:33:42 -06:00

posting.php

…

report.php

…

search.php

…

ucp.php

…

viewforum.php

…

viewonline.php

…

viewtopic.php

…

web.config

…