diff options
| author | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-08 21:44:10 -0300 |
|---|---|---|
| committer | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-08 21:44:10 -0300 |
| commit | 19fc3609dd964acafd253e0cc59a46b296f17552 (patch) | |
| tree | 871b0856af5e2dd5b816ee419857a38f80cd6b87 /templates/content/jquery-openid/images/google.gif | |
| parent | 0b80e6ba3fa528df2fc64a1a2e3a9f58dec39ec5 (diff) | |
| parent | 84c4766d7ce0ae7a6a93dbe996099a60b30fc9e5 (diff) | |
| download | askbot-19fc3609dd964acafd253e0cc59a46b296f17552.tar.gz askbot-19fc3609dd964acafd253e0cc59a46b296f17552.tar.bz2 askbot-19fc3609dd964acafd253e0cc59a46b296f17552.zip | |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG
* Merge of Spanish translation, still missing some texts.
* Custom colors for preguntalo project
Conflicts:
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
templates/content/style/style.css
Diffstat (limited to 'templates/content/jquery-openid/images/google.gif')
| -rw-r--r-- | templates/content/jquery-openid/images/google.gif | bin | 0 -> 1596 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/templates/content/jquery-openid/images/google.gif b/templates/content/jquery-openid/images/google.gif Binary files differnew file mode 100644 index 00000000..1b6cd07b --- /dev/null +++ b/templates/content/jquery-openid/images/google.gif |