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 | 0161159eb5b84d11908c16c6c86f93e1a8ac3c18 (patch) | |
tree | 871b0856af5e2dd5b816ee419857a38f80cd6b87 /templates/content/style/openid.css | |
parent | 0b80e6ba3fa528df2fc64a1a2e3a9f58dec39ec5 (diff) | |
parent | 46da3fdbe80ea1f6b9278d2671757d5fdb8abcfb (diff) | |
download | askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.tar.gz askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.tar.bz2 askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.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/style/openid.css')
-rw-r--r-- | templates/content/style/openid.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/content/style/openid.css b/templates/content/style/openid.css index 7a892840..0d201df2 100644 --- a/templates/content/style/openid.css +++ b/templates/content/style/openid.css @@ -42,4 +42,4 @@ } .openid_selected { border: 4px solid #DDD; - }
\ No newline at end of file + } |