diff options
| author | David Cramer | 2011-04-22 13:00:51 -0700 |
|---|---|---|
| committer | David Cramer | 2011-04-22 13:00:51 -0700 |
| commit | c2ab3cc4f8f86cc0e2705be0cc479572092f8060 (patch) | |
| tree | 4465e2f77c12a590e1ccd92ce04d41b24a983e11 /example | |
| parent | 3d88525fe7d64e5ed3c4e8a5056a6d0dd8224300 (diff) | |
| parent | f3a9b2b58bb468f65a5d5de2a5f8cb4b5ffe8b67 (diff) | |
| download | django-debug-toolbar-c2ab3cc4f8f86cc0e2705be0cc479572092f8060.tar.bz2 | |
Merge branch 'develop' of git://github.com/robhudson/django-debug-toolbar into robhudson-develop
Conflicts:
debug_toolbar/media/debug_toolbar/css/toolbar.css
debug_toolbar/media/debug_toolbar/css/toolbar.min.css
debug_toolbar/media/debug_toolbar/js/toolbar.min.js
debug_toolbar/middleware.py
debug_toolbar/panels/sql.py
debug_toolbar/templates/debug_toolbar/base.html
debug_toolbar/templates/debug_toolbar/panels/sql.html
Diffstat (limited to 'example')
0 files changed, 0 insertions, 0 deletions