]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Dec 2013 09:36:45 +0000 (10:36 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Dec 2013 09:36:45 +0000 (10:36 +0100)
1  2 
telemeta/static/telemeta/css/telemeta.css
telemeta/urls.py

Simple merge