diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-15 01:12:13 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-15 01:12:13 +0200 |
| commit | eb347add15c8c04a2e464c9153620bd41f2d0a2f (patch) | |
| tree | 9d9ca7e822df3ba7e6864540d0406f0557345b33 /setup.py | |
| parent | 20d155e5ccf647ce7d77ea86fae8cf36e2df9692 (diff) | |
| parent | 48e705e7ce868a55086794932dda92c060c228e8 (diff) | |
| download | Chimère-eb347add15c8c04a2e464c9153620bd41f2d0a2f.tar.bz2 Chimère-eb347add15c8c04a2e464c9153620bd41f2d0a2f.zip | |
Merge branch 'v2.2' into v3.0
Conflicts:
chimere/static/chimere/js/jquery.chimere.js
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions