diff options
| author | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-11 02:07:44 -0300 |
|---|---|---|
| committer | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-11 02:07:44 -0300 |
| commit | 3ba8dcf1da127053636b5e4c78eb6e4e523e5aba (patch) | |
| tree | b8d7deb8f9e245f8b5f8330860f867803a0e74dd /templates/content/jquery-openid/images/flickr.png | |
| parent | 306b82e6ef376fd3362dde41e3853dcf5688106d (diff) | |
| parent | 1eacc7a42618e84766477fbcc2c32a1da3547115 (diff) | |
| download | askbot-3ba8dcf1da127053636b5e4c78eb6e4e523e5aba.tar.gz askbot-3ba8dcf1da127053636b5e4c78eb6e4e523e5aba.tar.bz2 askbot-3ba8dcf1da127053636b5e4c78eb6e4e523e5aba.zip | |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG
Conflicts:
forum/views.py
locale/es/LC_MESSAGES/django.mo
settings_local.py
templates/answer_edit_tips.html
templates/book.html
templates/header.html
templates/index.html
templates/question_edit_tips.html
templates/user_stats.html
templates/user_tabs.html
templates/users_questions.html
Diffstat (limited to 'templates/content/jquery-openid/images/flickr.png')
| -rw-r--r-- | templates/content/jquery-openid/images/flickr.png | bin | 0 -> 426 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/templates/content/jquery-openid/images/flickr.png b/templates/content/jquery-openid/images/flickr.png Binary files differnew file mode 100644 index 00000000..142405a6 --- /dev/null +++ b/templates/content/jquery-openid/images/flickr.png |