David King 9485eea098 Merge branch 'develop' into ticket/11215 ...

* develop:
  [ticket/11694] Do not locate assets with root path

2013-07-14 00:34:49 -04:00

..

adm

[ticket/11675] Fix template loop

2013-07-13 16:25:08 -05:00

assets/javascript

…

cache

…

config

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

2013-07-13 09:36:24 -04:00

develop

Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission

2013-07-11 11:41:48 +02:00

docs

Merge branch 'develop-olympus' into develop

2013-07-13 19:30:57 +02:00

download

…

files

…

images

…

includes

Merge branch 'develop' into ticket/11215

2013-07-14 00:34:49 -04:00

install

[ticket/11687] Add assets_version to phpbb_config

2013-07-13 13:10:21 -04:00

language

Merge branch 'develop-olympus' into develop

2013-07-13 13:16:58 -04:00

store

…

styles

Merge pull request #1429 from cyberalien/ticket/11553

2013-07-13 14:20:23 -07:00

.htaccess

…

app.php

…

common.php

…

composer.json

Merge branch 'develop-olympus' into develop

2013-07-13 10:28:02 -05:00

composer.lock

Merge branch 'develop-olympus' into develop

2013-07-13 10:28:02 -05:00

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

[ticket/9657] Use the service instead of the static class

2013-07-11 14:24:07 +02:00

memberlist.php

Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission

2013-07-11 11:41:48 +02:00

posting.php

[ticket/9657] Use the service instead of the static class

2013-07-11 14:24:07 +02:00

report.php

…

search.php

[ticket/9657] Use the service instead of the static class

2013-07-11 14:24:07 +02:00

ucp.php

[ticket/11685] Remove logout confirmation page

2013-07-13 12:27:00 -04:00

viewforum.php

[ticket/9657] Remove last references to m_restore permission

2013-07-12 07:24:35 -04:00

viewonline.php

…

viewtopic.php

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

2013-07-13 09:36:24 -04:00

web.config

…