]> git.parisson.com Git - telemeta.git/commit
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)
commita2b6fd4e8b7fdbc46da5b5f44641fe2fc8fd98fc
tree1a3cf95eff8ccddcbc085aff0ca9edc1f4a5aa8b
parent632310bc0a058baf2e2dfef0843b01499c0a34a1
parente3959473c69cf98770428c1aef64a9d2ca42efd6
Merge branch 'dev' into diadems
telemeta/static/telemeta/css/telemeta.css
telemeta/urls.py