]> git.parisson.com Git - telemeta.git/commit
Merge remote-tracking branch 'parisson/release/1.6.4' into release/1.7
authorThomas Fillon <thomas@parisson.com>
Thu, 15 Jun 2017 15:51:23 +0000 (17:51 +0200)
committerThomas Fillon <thomas@parisson.com>
Thu, 15 Jun 2017 15:51:23 +0000 (17:51 +0200)
commit7da18a717b6c8f072dfae9484cd8d4156cb265be
tree2868fbc4ef5c3bfc675c19342465452957eac098
parent292c1792ea2a624508681bddf3b0b1e6f6cee741
parent3da87c51cfa87dd254b3272e30ad393e7b8f0862
Merge remote-tracking branch 'parisson/release/1.6.4' into release/1.7

Conflicts:
docker-compose.yml
setup.py
telemeta/views/core.py
app/scripts/app.sh
app/settings.py
telemeta/urls.py
telemeta/views/core.py
telemeta/views/item.py