diff options
| author | Jannis Leidel | 2012-03-31 17:11:11 +0200 |
|---|---|---|
| committer | Jannis Leidel | 2012-03-31 17:14:25 +0200 |
| commit | 2c7f68d55a6a0c101c41bd23ccb2d0ce9b332e42 (patch) | |
| tree | 5e93142d5fb3f464e50e36151c4c25d8347353e7 /debug_toolbar/panels/logger.py | |
| parent | 37a30194a1d5c9ebd7080954725dae38e19264fc (diff) | |
| download | django-debug-toolbar-2c7f68d55a6a0c101c41bd23ccb2d0ce9b332e42.tar.bz2 | |
Merge branch 'master' of https://github.com/ivirabyan/django-debug-toolbar into ivirabyan-master
Conflicts:
debug_toolbar/panels/cache.py
debug_toolbar/toolbar/loader.py
Diffstat (limited to 'debug_toolbar/panels/logger.py')
0 files changed, 0 insertions, 0 deletions