diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-24 22:38:43 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-08-24 22:38:43 +0200 |
| commit | 149185cda723c2d60fb581c5014ddedfa3a4fdf9 (patch) | |
| tree | 643043ec2d5b94d9bfb1c27acd58aa105d3b31fd /.gitignore | |
| parent | c76f9631a14e21881329f4f1383d2fd3327d432d (diff) | |
| parent | 02598e2ba0d244ced3d8bb25448d2a7bacf93ba7 (diff) | |
| download | Chimère-149185cda723c2d60fb581c5014ddedfa3a4fdf9.tar.bz2 Chimère-149185cda723c2d60fb581c5014ddedfa3a4fdf9.zip | |
Merge branch 'master' into saclay
Conflicts:
example_project/settings.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -6,4 +6,6 @@ example_project/settings.py example_project/static/icons/* example_project/static/upload/* +example_project/media/* +example_project/local_settings.py chimere_env/ |