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 | 5c97d5bb7e5a3b0c481a42e3a089971a958c2b73 (patch) | |
tree | b8d7deb8f9e245f8b5f8330860f867803a0e74dd /templates/content/jquery-openid/images | |
parent | 74d23cb7b0b85602fa7c7122f1c356ce7b80a49c (diff) | |
parent | cc378999abd39e070dbc87b482f022201a86b7fa (diff) | |
download | askbot-5c97d5bb7e5a3b0c481a42e3a089971a958c2b73.tar.gz askbot-5c97d5bb7e5a3b0c481a42e3a089971a958c2b73.tar.bz2 askbot-5c97d5bb7e5a3b0c481a42e3a089971a958c2b73.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')
-rw-r--r-- | templates/content/jquery-openid/images/blogger-1.png | bin | 0 -> 432 bytes |
-rw-r--r-- | templates/content/jquery-openid/images/claimid-0.png | bin | 0 -> 629 bytes |
-rw-r--r-- | templates/content/jquery-openid/images/flickr.png | bin | 0 -> 426 bytes |
-rw-r--r-- | templates/content/jquery-openid/images/livejournal-1.png | bin | 0 -> 713 bytes |
-rw-r--r-- | templates/content/jquery-openid/images/myopenid-2.png | bin | 0 -> 511 bytes |
-rw-r--r-- | templates/content/jquery-openid/images/technorati-1.png | bin | 0 -> 606 bytes |
-rw-r--r-- | templates/content/jquery-openid/images/verisign-2.png | bin | 0 -> 859 bytes |
-rw-r--r-- | templates/content/jquery-openid/images/vidoop.png | bin | 0 -> 499 bytes |
-rw-r--r-- | templates/content/jquery-openid/images/wordpress.png | bin | 0 -> 566 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/templates/content/jquery-openid/images/blogger-1.png b/templates/content/jquery-openid/images/blogger-1.png Binary files differnew file mode 100644 index 00000000..8b360ea5 --- /dev/null +++ b/templates/content/jquery-openid/images/blogger-1.png diff --git a/templates/content/jquery-openid/images/claimid-0.png b/templates/content/jquery-openid/images/claimid-0.png Binary files differnew file mode 100644 index 00000000..4a0ea1b3 --- /dev/null +++ b/templates/content/jquery-openid/images/claimid-0.png 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 diff --git a/templates/content/jquery-openid/images/livejournal-1.png b/templates/content/jquery-openid/images/livejournal-1.png Binary files differnew file mode 100644 index 00000000..e6436081 --- /dev/null +++ b/templates/content/jquery-openid/images/livejournal-1.png diff --git a/templates/content/jquery-openid/images/myopenid-2.png b/templates/content/jquery-openid/images/myopenid-2.png Binary files differnew file mode 100644 index 00000000..f64fb8e8 --- /dev/null +++ b/templates/content/jquery-openid/images/myopenid-2.png diff --git a/templates/content/jquery-openid/images/technorati-1.png b/templates/content/jquery-openid/images/technorati-1.png Binary files differnew file mode 100644 index 00000000..f7195240 --- /dev/null +++ b/templates/content/jquery-openid/images/technorati-1.png diff --git a/templates/content/jquery-openid/images/verisign-2.png b/templates/content/jquery-openid/images/verisign-2.png Binary files differnew file mode 100644 index 00000000..c1467008 --- /dev/null +++ b/templates/content/jquery-openid/images/verisign-2.png diff --git a/templates/content/jquery-openid/images/vidoop.png b/templates/content/jquery-openid/images/vidoop.png Binary files differnew file mode 100644 index 00000000..032c9e98 --- /dev/null +++ b/templates/content/jquery-openid/images/vidoop.png diff --git a/templates/content/jquery-openid/images/wordpress.png b/templates/content/jquery-openid/images/wordpress.png Binary files differnew file mode 100644 index 00000000..ee29f0cf --- /dev/null +++ b/templates/content/jquery-openid/images/wordpress.png |