summaryrefslogtreecommitdiffstats
path: root/forum/skins/default/media/images/openid/openid.gif
diff options
context:
space:
mode:
authorAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2010-02-15 23:18:02 -0600
committerAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2010-02-15 23:18:02 -0600
commit1e7bd132df5f56f397b555c7481a635c9d66a56a (patch)
tree54aac7789eb445d3d01eaea36f2956e386bb0086 /forum/skins/default/media/images/openid/openid.gif
parentd276802efa5899ccb568de1b4c445d54ea72c42d (diff)
parent89131389eb631456a0bdaa3a705488d43d0ced9b (diff)
downloadaskbot-1e7bd132df5f56f397b555c7481a635c9d66a56a.tar.gz
askbot-1e7bd132df5f56f397b555c7481a635c9d66a56a.tar.bz2
askbot-1e7bd132df5f56f397b555c7481a635c9d66a56a.zip
Merge commit 'osqa/master'
Conflicts: forum/skins/default/media/js/wmd/wmd.js forum/skins/default/templates/base.html forum/skins/default/templates/base_content.html forum/views.py locale/en/LC_MESSAGES/django.mo locale/en/LC_MESSAGES/django.po settings_local.py.dist
Diffstat (limited to 'forum/skins/default/media/images/openid/openid.gif')
-rw-r--r--forum/skins/default/media/images/openid/openid.gifbin0 -> 740 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/forum/skins/default/media/images/openid/openid.gif b/forum/skins/default/media/images/openid/openid.gif
new file mode 100644
index 00000000..c718b0e6
--- /dev/null
+++ b/forum/skins/default/media/images/openid/openid.gif
Binary files differ