]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 19 Dec 2013 10:13:35 +0000 (11:13 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 19 Dec 2013 10:13:35 +0000 (11:13 +0100)
commit915a58c309c1b99f53ef54fef18449a1132205c0
tree5a93c4b130ec4f1067a001af1ade446efc2d4889
parent068865f64bf36a4acceb44686780768a29183277
parent59942b76a96b82f2069de82df592738bcfe9e088
Merge branch 'dev' into crem2

Conflicts:
telemeta/models/media.py
example/sandbox/settings.py
telemeta/models/media.py
telemeta/templates/telemeta/collection_detail.html
telemeta/urls.py
telemeta/views/instrument.py