diff options
| author | David Cramer | 2011-07-14 11:08:19 -0700 |
|---|---|---|
| committer | David Cramer | 2011-07-14 11:08:19 -0700 |
| commit | f254204725300747b46f13862f5f638608dda71d (patch) | |
| tree | 8e1556cfc767755a51e1f95c97c92b7deee02d92 /setup.py | |
| parent | fdd25705a4b0443694cf6da9e0f846e991c44493 (diff) | |
| parent | f2aeaaa739c029cd6fed9cb9e50455b670a6b7ca (diff) | |
| download | django-debug-toolbar-f254204725300747b46f13862f5f638608dda71d.tar.bz2 | |
Merge branch 'master' of https://github.com/dokterbob/django-debug-toolbar into dokterbob-master
Conflicts:
debug_toolbar/panels/request_vars.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions