Merge branch 'develop-olympus' into develop

Browse Source

* develop-olympus:
  [ticket/10773] ACP logo with registered trademark symbol

...

This commit is contained in:

Andreas Fischer

2012-07-01 00:20:04 +02:00

parent 2d250247f4 3ecc43d48c

commit d998ad4b15

3 changed files with 3 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

phpBB/adm/images/phpbb_logo.gif

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 3.8 KiB

BIN

phpBB/adm/images/phpbb_logo.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 9.1 KiB