Nils Adermann c39d3b56a7 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".

2013-07-13 13:09:45 -04:00

..

adm

Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into develop

2013-07-12 14:59:43 -05:00

assets/javascript

Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop

2013-06-06 14:07:27 -05:00

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 remote-tracking branch 'phpbb/develop' into ticket/9657

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

download

[ticket/10820] fix if condition to check for IE

2013-06-14 00:29:06 +05:30

files

…

images

…

includes

Merge pull request #1017 from nickvergessen/feature/softdelete-1-permission

2013-07-13 08:57:20 -07:00

install

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

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

language

Merge branch 'develop-olympus' into develop

2013-07-13 13:09:45 -04:00

store

…

styles

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

2013-07-13 09:36:24 -04: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

[ticket/11481] Move prepended slash from calls into function

2013-06-06 20:35:38 +02:00

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

Merge branch 'ticket/11566' into ticket/11566-develop

2013-07-01 23:25:29 +05:30

search.php

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

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

ucp.php

…

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

…