diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-14 18:48:00 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-14 18:48:00 +0100 |
| commit | 054fdbdf7a1e5106725b8b5a36db99242cfa65c1 (patch) | |
| tree | 1633b26e884feb1f29afedbb80cef7a6ecbdba2d /MANIFEST.in | |
| parent | 8a5ba2650678ec22107a1a0a10650b6e0cc14683 (diff) | |
| parent | d02ec4246813eb0787bf3ab54af1af9ce32bd376 (diff) | |
| download | Chimère-054fdbdf7a1e5106725b8b5a36db99242cfa65c1.tar.bz2 Chimère-054fdbdf7a1e5106725b8b5a36db99242cfa65c1.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/static/chimere/css/styles.css
chimere/static/chimere/js/jquery.chimere.js
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/utils.py
chimere/views.py
example_project/settings.py
Diffstat (limited to 'MANIFEST.in')
| -rw-r--r-- | MANIFEST.in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..7b2ddd9 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,12 @@ +include *.txt MANIFEST.in +include chimere/tests/* +prune docs/*/*/build/ +include docs/*/*.rst +include docs/*/Makefile +include docs/*/conf.py +include docs/*/static/*.png +recursive-include apache *.conf *.wsgi +recursive-include chimere/templates *.html *.csv *.kml +recursive-include chimere/static *.css *.js *.png *.gif *.swf +recursive-include chimere/locale *.po +recursive-include chimere/fixtures *.json |