Fixing conflict list; adding AD column.
- Legacy-Id: 4961
Note: SVN reference [4904] has been migrated to Git commit
|
||
---|---|---|
.. | ||
migrations | ||
.gitignore | ||
__init__.py | ||
admin.py | ||
models.py | ||
proxy.py | ||
tests.py | ||
testurl.list | ||
timedeltafield.py | ||
urls.py | ||
views.py |