summaryrefslogtreecommitdiffstats
path: root/templates/upfiles
diff options
context:
space:
mode:
authorBruno Sarlo <bruno@bruno-laptop.(none)>2009-08-08 21:43:46 -0300
committerBruno Sarlo <bruno@bruno-laptop.(none)>2009-08-08 21:43:46 -0300
commit9092721573a3443e0ab63da7883324684838c358 (patch)
tree871b0856af5e2dd5b816ee419857a38f80cd6b87 /templates/upfiles
parent57b1535b08e97f93529e0a8e1de16a538f3c4348 (diff)
parentaa8c379c31d251b0882213d34fbeb387d6ffa473 (diff)
downloadaskbot-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 'templates/upfiles')
-rwxr-xr-xtemplates/upfiles/1245715031297631.pngbin0 -> 3863 bytes
-rwxr-xr-xtemplates/upfiles/12457157052552259.pngbin0 -> 3863 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/templates/upfiles/1245715031297631.png b/templates/upfiles/1245715031297631.png
new file mode 100755
index 00000000..89a6aed4
--- /dev/null
+++ b/templates/upfiles/1245715031297631.png
Binary files differ
diff --git a/templates/upfiles/12457157052552259.png b/templates/upfiles/12457157052552259.png
new file mode 100755
index 00000000..89a6aed4
--- /dev/null
+++ b/templates/upfiles/12457157052552259.png
Binary files differ