diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-23 19:56:52 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-23 19:56:52 +0200 |
| commit | 2808bb76a4b7ed06aacff8f5cf45e215ac95f0cf (patch) | |
| tree | 074b98606a06496929b75172495b1d019aaa9cdd /chimere/models.py | |
| parent | 1d03951916abe35062d16336f6cf80c989004493 (diff) | |
| parent | 76c03459c5fb7439a7158f4911556f85cb324d18 (diff) | |
| download | Chimère-2808bb76a4b7ed06aacff8f5cf45e215ac95f0cf.tar.bz2 Chimère-2808bb76a4b7ed06aacff8f5cf45e215ac95f0cf.zip | |
Merge branch 'v2.2'
Conflicts:
chimere/static/chimere/js/jquery.chimere.js
Diffstat (limited to 'chimere/models.py')
0 files changed, 0 insertions, 0 deletions