]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into feature/haystack
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 4 Sep 2015 15:46:29 +0000 (17:46 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 4 Sep 2015 15:46:29 +0000 (17:46 +0200)
commitecfea0b3846f42a8afece6dc2576e02be9f6e323
tree76f72ded55735342e54f7326041ab33dfddc6083
parent4f9d9664a1f3bde20c2a210b700ab8a0052da836
parent976e0b8ae0b930f0362a27efe4950d7429254614
Merge branch 'dev' into feature/haystack
examples/sandbox/settings.py
telemeta/static/telemeta/css/telemeta.css
telemeta/templates/telemeta/base.html
telemeta/urls.py