Merge branch 'master' of git@github.com:jezdez/django-dbtemplates

Browse source

Conflicts:
	docs/overview.txt

committer: Jannis Leidel <jannis@leidel.info>

--HG--
extra : convert_revision : e3e5cfa40c5c3ea7c4308048fbe0effaa81cd145

...

This commit is contained in:

Jannis Leidel 2008-11-28 14:13:18 +01:00

parent 6491d781f2 85539c107e

commit 7e3a9f5ece

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available