diff options
| author | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-11 02:07:44 -0300 |
|---|---|---|
| committer | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-11 02:07:44 -0300 |
| commit | 5c97d5bb7e5a3b0c481a42e3a089971a958c2b73 (patch) | |
| tree | b8d7deb8f9e245f8b5f8330860f867803a0e74dd /templates/user.html | |
| parent | 74d23cb7b0b85602fa7c7122f1c356ce7b80a49c (diff) | |
| parent | cc378999abd39e070dbc87b482f022201a86b7fa (diff) | |
| download | askbot-5c97d5bb7e5a3b0c481a42e3a089971a958c2b73.tar.gz askbot-5c97d5bb7e5a3b0c481a42e3a089971a958c2b73.tar.bz2 askbot-5c97d5bb7e5a3b0c481a42e3a089971a958c2b73.zip | |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG
Conflicts:
forum/views.py
locale/es/LC_MESSAGES/django.mo
settings_local.py
templates/answer_edit_tips.html
templates/book.html
templates/header.html
templates/index.html
templates/question_edit_tips.html
templates/user_stats.html
templates/user_tabs.html
templates/users_questions.html
Diffstat (limited to 'templates/user.html')
0 files changed, 0 insertions, 0 deletions