]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into release/1.7
authorThomas Fillon <thomas@parisson.com>
Mon, 18 Sep 2017 22:04:21 +0000 (00:04 +0200)
committerThomas Fillon <thomas@parisson.com>
Mon, 18 Sep 2017 22:04:21 +0000 (00:04 +0200)
commit558bbb2a4238b7fa9374a072beac78a7fe5820ce
treeb0a124b3a626b89c497fae2a8de7295233d9388b
parent0eceba1995f7289246f91c2156f8d08bb49fc2b0
parentd25fe74e29479c4c45667c098b17f808714eb589
Merge branch 'master' into release/1.7

Conflicts:
app/scripts/app.sh
app/settings.py
requirements-dev.txt
setup.py
telemeta/models/resource.py
telemeta/urls.py
telemeta/views/admin.py
telemeta/views/collection.py
12 files changed:
app/scripts/app.sh
app/settings.py
requirements-dev.txt
telemeta/forms/media.py
telemeta/models/resource.py
telemeta/south_migrations/0035_auto__chg_field_recordingcontext_notes__chg_field_recordingcontext_val.py
telemeta/templates/telemeta/base.html
telemeta/urls.py
telemeta/views/admin.py
telemeta/views/collection.py
telemeta/views/home.py
telemeta/views/item.py