diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-13 23:23:21 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-13 23:23:21 +0200 |
| commit | a243a38178d4db223eb8dc21cabec1bb2b2764c8 (patch) | |
| tree | 770a5791bf1d149b455abb1678237546a316c261 /.gitignore | |
| parent | 05003124ae5f03de6fe8fd4a9304dcf3d64e859e (diff) | |
| parent | 59db8f041c74c6ef7cd2bbede5562538154554bc (diff) | |
| download | Ishtar-a243a38178d4db223eb8dc21cabec1bb2b2764c8.tar.bz2 Ishtar-a243a38178d4db223eb8dc21cabec1bb2b2764c8.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 630de0585..0aeb8dee4 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ local_settings.py fabfile.py example_project/media example_project/static -docs/build +docs/*/build Makefile oook_replace .zanata-cache |