diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-05 11:16:23 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-05 11:16:23 +0200 |
| commit | 30823d4f319d15065be975bc11073015b9292a7e (patch) | |
| tree | 8e7d18e6a77f4d4453fa3691d16815097a4e09d2 /chimere_example_project/settings.py | |
| parent | fbfdee111ce846a21cc2dbee288a70ea5429dc52 (diff) | |
| parent | 9b4c27b5ce985ccf34202a9d91b419475bce076b (diff) | |
| download | Chimère-30823d4f319d15065be975bc11073015b9292a7e.tar.bz2 Chimère-30823d4f319d15065be975bc11073015b9292a7e.zip | |
Merge branch 'v2.2'
Conflicts:
chimere/views.py
Diffstat (limited to 'chimere_example_project/settings.py')
0 files changed, 0 insertions, 0 deletions