Marc Alexander 0679a403d5 Merge branch 'ticket/8960-olympus' into ticket/8960 ...

Conflicts:
	phpBB/includes/acp/acp_board.php

2014-04-16 10:11:09 +02:00

..

adm

Merge remote-tracking branch 'marc/ticket/12372' into develop-ascraeus

2014-04-14 12:33:33 +02:00

assets

Merge remote-tracking branch 'marc/ticket/12372' into develop-ascraeus

2014-04-14 12:33:33 +02:00

bin

…

cache

…

config

…

develop

[ticket/12348] Allow to run create_schema_files when phpBB is not installed

2014-04-03 14:44:07 +02:00

docs

Merge remote-tracking branch 'paybas/ticket/12377' into develop-ascraeus

2014-04-11 10:35:35 +02:00

download

…

files

…

images

…

includes

[ticket/8960] Allow changing avatar path if it's not writable

2014-04-14 22:44:37 +02:00

install

Merge branch 'develop-olympus' into develop-ascraeus

2014-04-10 15:44:47 +02:00

language

Merge branch 'ticket/8960-olympus' into ticket/8960

2014-04-16 10:11:09 +02:00

phpbb

Merge branch 'ticket/8960-olympus' into ticket/8960

2014-04-16 10:11:09 +02:00

store

…

styles

Merge remote-tracking branch 'marc/ticket/12372' into develop-ascraeus

2014-04-14 12:33:33 +02:00

.htaccess

…

app.php

…

common.php

…

composer.json

…

composer.lock

…

cron.php

…

faq.php

[ticket/12364] Add template identifier var to all missing pages

2014-04-06 17:41:09 +02:00

feed.php

…

index.php

[ticket/12364] Add template identifier var to all missing pages

2014-04-06 17:41:09 +02:00

mcp.php

…

memberlist.php

[ticket/12364] Add template identifier var to all missing pages

2014-04-06 17:41:09 +02:00

posting.php

[ticket/12356] Assign vars preventing Plupload from loading in PM editor.

2014-04-09 11:38:14 -07:00

report.php

[ticket/12364] Add template identifier var to all missing pages

2014-04-06 17:41:09 +02:00

search.php

…

ucp.php

[ticket/12360] Fix duplicated creation of session when logging out the user

2014-04-06 23:49:20 +02:00

viewforum.php

…

viewonline.php

[ticket/12364] Add template identifier var to all missing pages

2014-04-06 17:41:09 +02:00

viewtopic.php

Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeus

2014-04-05 09:54:14 +02:00

web.config

…