diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-05 10:51:55 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-05 10:51:55 +0200 |
| commit | c63a96e15b885a45348554995c48f4ee71a59324 (patch) | |
| tree | 8fe0de2e97217b356206767ccf5e1dd162574e6a /chimere/models.py | |
| parent | 65d02e6059e7ac4f6d010108d6603b7289a9a6a5 (diff) | |
| parent | 5c6d025584deb57861f49541daf0769513eac5e9 (diff) | |
| download | Chimère-c63a96e15b885a45348554995c48f4ee71a59324.tar.bz2 Chimère-c63a96e15b885a45348554995c48f4ee71a59324.zip | |
Merge branch 'v2.2'
Conflicts:
chimere/views.py
Diffstat (limited to 'chimere/models.py')
0 files changed, 0 insertions, 0 deletions