aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorAlex Gaynor2008-10-06 18:33:49 -0400
committerAlex Gaynor2008-10-06 18:33:49 -0400
commitc10e9814d878eb06cba33387f6b5681e47b163fb (patch)
tree0e3192b8f3b496fa1a3fa07a51c0f9a3acfd7a50 /setup.py
parent0368d75afbe578951bcded286a3122c5302e3e4d (diff)
parenta3492e14765e3f898efc26913a8e8c4445a837b4 (diff)
downloaddjango-debug-toolbar-c10e9814d878eb06cba33387f6b5681e47b163fb.tar.bz2
resolved merge conflicts
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions