diff options
| author | David Cramer | 2011-04-22 13:02:59 -0700 |
|---|---|---|
| committer | David Cramer | 2011-04-22 13:02:59 -0700 |
| commit | bed167f9f6784ca18196a695cf62bf81f57a80cd (patch) | |
| tree | db924506015c5c2de4037f6f062b66e0b3652076 /example | |
| parent | c2ab3cc4f8f86cc0e2705be0cc479572092f8060 (diff) | |
| parent | 3929bf2066e108695546e2dd8db14579a8710126 (diff) | |
| download | django-debug-toolbar-bed167f9f6784ca18196a695cf62bf81f57a80cd.tar.bz2 | |
Merge branch 'profiling' of git://github.com/dmclain/django-debug-toolbar into dmclain-master
Conflicts:
debug_toolbar/media/debug_toolbar/css/toolbar.min.css
debug_toolbar/media/debug_toolbar/js/toolbar.min.js
Diffstat (limited to 'example')
0 files changed, 0 insertions, 0 deletions