summaryrefslogtreecommitdiff
path: root/theme/cloudy/logo.png
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-22 13:56:16 -0700
committerBrion Vibber <brion@pobox.com>2010-03-22 13:56:16 -0700
commite89908f26140c217e01b2f8f755712f38f3935f3 (patch)
tree6b241fc2e33f3528cf48b415ef67906826b02e24 /theme/cloudy/logo.png
parent714d920faea302b55857cc3bec4e9e6160ea136a (diff)
parenteb563937df921e5fc67ca0c87e229feb2907fd19 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
Conflicts: lib/channel.php scripts/imdaemon.php
Diffstat (limited to 'theme/cloudy/logo.png')
-rw-r--r--theme/cloudy/logo.pngbin6389 -> 10107 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/theme/cloudy/logo.png b/theme/cloudy/logo.png
index 550d373fe..cf1839194 100644
--- a/theme/cloudy/logo.png
+++ b/theme/cloudy/logo.png
Binary files differ