diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-06 15:37:44 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-06 15:37:44 +0200 |
| commit | e9c39c4b0f85fafb06da3acc8c89c187403260d7 (patch) | |
| tree | b72c8aeb65dd93be5d44e265b480283f7d09e278 /local_settings.py.pip.sample | |
| parent | 4268fe123c1450b01aa64b29f8c8a68a9ffba5d9 (diff) | |
| parent | 9de8170e48507e9d024ee7bba5862bb755e5c1d9 (diff) | |
| download | Chimère-e9c39c4b0f85fafb06da3acc8c89c187403260d7.tar.bz2 Chimère-e9c39c4b0f85fafb06da3acc8c89c187403260d7.zip | |
Merge branch 'v2.9' into v3.0
Conflicts:
chimere/models.py
Diffstat (limited to 'local_settings.py.pip.sample')
0 files changed, 0 insertions, 0 deletions