diff options
| author | Idan Gazit | 2009-08-26 01:58:35 +0300 |
|---|---|---|
| committer | Idan Gazit | 2009-08-26 01:58:35 +0300 |
| commit | 16fe40b7e54ba31e845e6c73c68c0b15d782306a (patch) | |
| tree | 6f0a9bca9c02189881f05d3b2bb05815e7991fc5 /debug_toolbar/urls.py | |
| parent | 0b2e7031d9d89571055df5bad3d6cf0586a9ef61 (diff) | |
| parent | 2edab7a07cec1a89e976c02af2d5b8fb43b18bc2 (diff) | |
| download | django-debug-toolbar-16fe40b7e54ba31e845e6c73c68c0b15d782306a.tar.bz2 | |
Merge commit 'upstream/ui-rf'
Conflicts:
debug_toolbar/templates/debug_toolbar/panels/headers.html
debug_toolbar/templates/debug_toolbar/panels/logger.html
debug_toolbar/templates/debug_toolbar/panels/request_vars.html
debug_toolbar/templates/debug_toolbar/panels/settings_vars.html
debug_toolbar/templates/debug_toolbar/panels/signals.html
debug_toolbar/templates/debug_toolbar/panels/sql.html
debug_toolbar/templates/debug_toolbar/panels/template_source.html
debug_toolbar/templates/debug_toolbar/panels/timer.html
Diffstat (limited to 'debug_toolbar/urls.py')
0 files changed, 0 insertions, 0 deletions