diff options
| author | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-08 21:43:46 -0300 |
|---|---|---|
| committer | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-08 21:43:46 -0300 |
| commit | 9092721573a3443e0ab63da7883324684838c358 (patch) | |
| tree | 871b0856af5e2dd5b816ee419857a38f80cd6b87 /.gitignore | |
| parent | 57b1535b08e97f93529e0a8e1de16a538f3c4348 (diff) | |
| parent | aa8c379c31d251b0882213d34fbeb387d6ffa473 (diff) | |
| download | askbot-9092721573a3443e0ab63da7883324684838c358.tar.gz askbot-9092721573a3443e0ab63da7883324684838c358.tar.bz2 askbot-9092721573a3443e0ab63da7883324684838c358.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 '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1,4 +1,3 @@ -settings_local.py *.pyc *.swp *.log |