]> git.parisson.com Git - telemeta.git/commit
Merge branch 'feature/html5' into feature/dj1.8
authorThomas Fillon <thomas@parisson.com>
Tue, 11 Apr 2017 14:20:04 +0000 (16:20 +0200)
committerThomas Fillon <thomas@parisson.com>
Tue, 11 Apr 2017 14:20:04 +0000 (16:20 +0200)
commite92390c2cf5b0250b4d51ab097d07ad07927a317
tree12ed722b4c8020cd06d27dd3c82c94f665313cba
parent470ef1f151a3fc5c0bd34ac9596410ef170cb756
parent3020b6b62f289cbdeeabad9e59e29b184089cff9
Merge branch 'feature/html5' into feature/dj1.8

Conflicts:
telemeta/views/core.py
telemeta/views/item.py
app/scripts/app.sh
telemeta/views/admin.py
telemeta/views/collection.py
telemeta/views/core.py