]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into crem2
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 19 Dec 2013 12:46:07 +0000 (13:46 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 19 Dec 2013 12:46:07 +0000 (13:46 +0100)
commit67a48e940bc6c7e0c09c4a8985aae28035074f4d
tree3ffa2c4c289f871346f9a47b6f64a7aeb23a167d
parent49f47d8b557227e39a46534fcf06eb3ff4839d39
parentc6cfe43571f75ca13aaa81af28ae59a409affb5b
Merge branch 'dev' into crem2
telemeta/static/telemeta/css/telemeta.css
telemeta/urls.py
telemeta/views/core.py
telemeta/views/instrument.py