Joas Schilling 6c6912f9e6 [ticket/9657] FIx merge conflict from merging develop ...

PHPBB3-9657

2013-03-05 18:23:13 +01:00

..

adm

[feature/migrations] Catch and display errors from the migrator

2013-02-09 21:09:29 -06:00

assets/javascript

[ticket/11103] Only lookup $(target) once

2013-01-15 12:30:26 -06:00

cache

…

config

[ticket/11386] Fix circular reference error & serialize error

2013-03-02 14:15:59 -06:00

develop

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission

2013-03-03 20:06:52 +01:00

docs

Merge branch 'develop-olympus' into develop

2013-02-24 17:37:38 +01:00

download

[ticket/11306] Introduce phpbb_create_default_container

2013-01-02 06:41:35 +01:00

files

…

images

…

includes

[ticket/9657] FIx merge conflict from merging develop

2013-03-05 18:23:13 +01:00

install

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission

2013-03-03 20:06:52 +01:00

language

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission

2013-03-03 20:06:52 +01:00

store

…

styles

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission

2013-03-03 20:06:52 +01:00

.htaccess

…

app.php

…

common.php

[ticket/11305] Define hook finder as a service on the container.

2013-01-02 01:36:50 -05:00

composer.json

…

composer.lock

…

cron.php

…

faq.php

…

feed.php

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase

2012-12-20 22:51:38 +01:00

index.php

[ticket/11103] Instantiate $phpbb_notifications as needed

2012-12-13 19:19:40 -06:00

mcp.php

…

memberlist.php

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission

2013-03-03 20:06:52 +01:00

posting.php

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase

2012-12-20 22:51:38 +01:00

report.php

Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103

2013-01-15 11:31:39 -06:00

search.php

…

ucp.php

…

viewforum.php

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase

2012-12-20 22:51:38 +01:00

viewonline.php

[ticket/11259] adm_relative_path -> phpbb_adm_relative_path

2012-12-09 19:29:51 -06:00

viewtopic.php

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

web.config

…