diff options
| author | Jannis Leidel | 2013-03-02 14:09:30 +0100 |
|---|---|---|
| committer | Jannis Leidel | 2013-03-02 14:09:30 +0100 |
| commit | 0844c8b24527486d43f8ab18241ce0b7f900129b (patch) | |
| tree | d9db1cd777ee7b122665b5358c0b1d24d30f93a7 /debug_toolbar/urls.py | |
| parent | 42d7dde77e1c2daffaa5fa5bd16184f52c413c20 (diff) | |
| parent | 54f4f3a7361ae711641b511df5a4c8962ad623a4 (diff) | |
| download | django-debug-toolbar-0844c8b24527486d43f8ab18241ce0b7f900129b.tar.bz2 | |
Merge branch 'issue_230' of git://github.com/akaariai/django-debug-toolbar into akaariai-issue_230
Conflicts:
debug_toolbar/utils/tracking/db.py
Diffstat (limited to 'debug_toolbar/urls.py')
0 files changed, 0 insertions, 0 deletions