diff options
| author | Rob Hudson | 2009-11-02 13:06:46 -0800 |
|---|---|---|
| committer | Rob Hudson | 2009-11-02 13:06:46 -0800 |
| commit | 8249c78e5dffd85f0d2216864fa115e9320186d0 (patch) | |
| tree | 511765647ab2c5607c4c356e2a4851e6693f29be /MANIFEST.in | |
| parent | 4a1e4ee0891c1c6c3765f479fcef2f23fe28faca (diff) | |
| parent | 55f21310a27c6c08033501bdcdbcd7d2915942bc (diff) | |
| download | django-debug-toolbar-8249c78e5dffd85f0d2216864fa115e9320186d0.tar.bz2 | |
Merge branch 'master' into tx-master
Conflicts:
debug_toolbar/locale/he/LC_MESSAGES/django.po
debug_toolbar/templates/debug_toolbar/panels/versions.html
Diffstat (limited to 'MANIFEST.in')
0 files changed, 0 insertions, 0 deletions