]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 28 Jun 2013 22:36:09 +0000 (00:36 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 28 Jun 2013 22:36:09 +0000 (00:36 +0200)
commitc71b18ef59433092a1eb49d1d1735e5c5f443010
tree1a3cf95eff8ccddcbc085aff0ca9edc1f4a5aa8b
parent6d2ada5ca01c8e611f3aa98eee46c137df84f8dd
parente3959473c69cf98770428c1aef64a9d2ca42efd6
Merge branch 'dev' into crem2
telemeta/static/telemeta/css/telemeta.css
telemeta/urls.py