aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/images
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-07-01 00:19:52 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-07-01 00:19:52 +0200
commit3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b (patch)
tree4096ffd5f76e12e3bdc02e2018715a1508d28134 /phpBB/adm/images
parent7fba5a0f38f2a8e21c1717ff0311d28b5bda54dc (diff)
parente5364088c310722e292566500973a28a300f258f (diff)
downloadforums-3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b.tar
forums-3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b.tar.gz
forums-3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b.tar.bz2
forums-3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b.tar.xz
forums-3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b.zip
Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11: [ticket/10773] ACP logo with registered trademark symbol
Diffstat (limited to 'phpBB/adm/images')
-rw-r--r--phpBB/adm/images/phpbb_logo.gifbin3883 -> 0 bytes
-rw-r--r--phpBB/adm/images/phpbb_logo.pngbin0 -> 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
deleted file mode 100644
index 239993182b..0000000000
--- a/phpBB/adm/images/phpbb_logo.gif
+++ /dev/null
Binary files differ
diff --git a/phpBB/adm/images/phpbb_logo.png b/phpBB/adm/images/phpbb_logo.png
new file mode 100644
index 0000000000..c3f9248ed7
--- /dev/null
+++ b/phpBB/adm/images/phpbb_logo.png
Binary files differ