]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Jan 2014 12:09:41 +0000 (13:09 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 9 Jan 2014 12:09:41 +0000 (13:09 +0100)
commitdafd447d59d70d85de945a410d1fb95fb6a642bd
tree77ccaf5f1e6bb7357c5125fcfdb9b5614c8881ad
parentd0d2f282da8c3ab9b81a28ead3e4286d794eef76
parent4bf8d600583b1bfc7cfa87bc5100651aa35fc961
Merge branch 'dev' into crem2

Conflicts:
telemeta/models/media.py
telemeta/urls.py
telemeta/models/media.py
telemeta/static/telemeta/css/telemeta.css
telemeta/templates/telemeta/base.html
telemeta/urls.py