]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'dev' into diadems
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 28 Jun 2013 22:36:28 +0000 (00:36 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 28 Jun 2013 22:36:28 +0000 (00:36 +0200)
1  2 
telemeta/static/telemeta/css/telemeta.css
telemeta/urls.py

Simple merge