diff options
| author | Ulrich Petri <ulo@ulo.pe> | 2011-01-28 00:01:55 +0100 |
|---|---|---|
| committer | Ulrich Petri <ulo@ulo.pe> | 2011-01-28 00:01:55 +0100 |
| commit | 68df68833bcb966b681ab36abae366c8eecb811f (patch) | |
| tree | 4733841def44a365f3cc025fa88757eb85e789ad /.gitignore | |
| parent | 51d1058d0620cf34606044e3b829907fec7aa582 (diff) | |
| parent | 10e8b3be3e9d5d591641c408fcf6f5337070b4c5 (diff) | |
| download | django-compressor-68df68833bcb966b681ab36abae366c8eecb811f.tar.gz | |
Merge branch 'master' into offline
Conflicts:
.gitignore
tests/settings.py
Moved offline test template to new location.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -4,4 +4,6 @@ dist MANIFEST *.pyc *.egg-info -tests/media/ +.tox/ +*.egg +docs/_build/ |