diff options
author | Dusty Phillips <buchuki@gmail.com> | 2008-06-20 17:44:20 -0400 |
---|---|---|
committer | Dusty Phillips <buchuki@gmail.com> | 2008-06-20 17:44:20 -0400 |
commit | de85d8177b7ae53acac1e11f68dc211e30be3920 (patch) | |
tree | 9acc3646e4e1a802c405acc0455293f007177363 /settings.py | |
parent | 39affe588899b67c0bcd7e290c54d3ebb5c0b0f0 (diff) | |
parent | 041064473a54c5010dd102e4892cef0f47ecfdbd (diff) |
Merge branch 'master' into newmodel
Diffstat (limited to 'settings.py')
0 files changed, 0 insertions, 0 deletions