diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-12 10:40:13 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-12 10:40:13 -0600 |
| commit | 9e70d5be2571f7671c06c6960c04fff414b4d87c (patch) | |
| tree | 439577b5a127699e845f668c6b5b8cef46df8516 /context.py | |
| parent | 4d5026f13cad0397e6547658f56348007f4173f4 (diff) | |
| parent | c96c664789084179e54c369406b5dfcbeadab141 (diff) | |
| download | askbot-9e70d5be2571f7671c06c6960c04fff414b4d87c.tar.gz askbot-9e70d5be2571f7671c06c6960c04fff414b4d87c.tar.bz2 askbot-9e70d5be2571f7671c06c6960c04fff414b4d87c.zip | |
Merge branch 'experimental' of git@github.com:fitoria/CNPROG into experimental
Conflicts:
locale/es/LC_MESSAGES/django.po
templates/header.html
Diffstat (limited to 'context.py')
0 files changed, 0 insertions, 0 deletions