diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-01 00:20:04 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-01 00:20:04 +0200 |
| commit | d998ad4b15a8fb0204db7f05c7b71e7c2c6b85bf (patch) | |
| tree | f6ec05b8f8ea90fb06eaee4d50712d04a47b52ae /phpBB/adm/images | |
| parent | 2d250247f4c1e7cd1f8d4a66c6f31c798dc0d9c5 (diff) | |
| parent | 3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b (diff) | |
| download | forums-d998ad4b15a8fb0204db7f05c7b71e7c2c6b85bf.tar forums-d998ad4b15a8fb0204db7f05c7b71e7c2c6b85bf.tar.gz forums-d998ad4b15a8fb0204db7f05c7b71e7c2c6b85bf.tar.bz2 forums-d998ad4b15a8fb0204db7f05c7b71e7c2c6b85bf.tar.xz forums-d998ad4b15a8fb0204db7f05c7b71e7c2c6b85bf.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10773] ACP logo with registered trademark symbol
Diffstat (limited to 'phpBB/adm/images')
| -rw-r--r-- | phpBB/adm/images/phpbb_logo.gif | bin | 3883 -> 0 bytes |
| -rw-r--r-- | phpBB/adm/images/phpbb_logo.png | bin | 0 -> 9313 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/phpBB/adm/images/phpbb_logo.gif b/phpBB/adm/images/phpbb_logo.gif Binary files differdeleted file mode 100644 index 239993182b..0000000000 --- a/phpBB/adm/images/phpbb_logo.gif +++ /dev/null diff --git a/phpBB/adm/images/phpbb_logo.png b/phpBB/adm/images/phpbb_logo.png Binary files differnew file mode 100644 index 0000000000..c3f9248ed7 --- /dev/null +++ b/phpBB/adm/images/phpbb_logo.png |
