diff options
author | Nils Adermann <naderman@naderman.de> | 2013-07-13 13:09:33 -0400 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2013-07-13 13:09:33 -0400 |
commit | 1c9604286dd9c591ca1de8ced6a56abe72f72422 (patch) | |
tree | 74fcfbb5474e985d35139fd4301dab8098cd3e15 /phpBB/includes | |
parent | b1b37ddde2ddf6bae5d64e634f070c7f7afd251f (diff) | |
parent | 9d57c9635cf7d5044c275dfc5dbe19939e0a81b9 (diff) | |
download | forums-1c9604286dd9c591ca1de8ced6a56abe72f72422.tar forums-1c9604286dd9c591ca1de8ced6a56abe72f72422.tar.gz forums-1c9604286dd9c591ca1de8ced6a56abe72f72422.tar.bz2 forums-1c9604286dd9c591ca1de8ced6a56abe72f72422.tar.xz forums-1c9604286dd9c591ca1de8ced6a56abe72f72422.zip |
Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
[ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
Diffstat (limited to 'phpBB/includes')
0 files changed, 0 insertions, 0 deletions