diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-06-07 17:24:22 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-06-07 17:24:22 +0200 |
| commit | 3835ed15d6fb0fd63e22a728f790fe564d9b4a32 (patch) | |
| tree | 35bdf226cddd70a96abd4e14b4175debd036b804 /project_static | |
| parent | 5b0240709be25116b950ed39301553b51778f967 (diff) | |
| parent | 55d98517fede51fb945f48ecb73a02e52ebd4158 (diff) | |
| download | Chimère-3835ed15d6fb0fd63e22a728f790fe564d9b4a32.tar.bz2 Chimère-3835ed15d6fb0fd63e22a728f790fe564d9b4a32.zip | |
Merge branch 'v2.0'
Conflicts:
settings.py
Diffstat (limited to 'project_static')
| -rw-r--r-- | project_static/.project_static | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/project_static/.project_static b/project_static/.project_static new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/project_static/.project_static |