]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into feature/haystack
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 20 Jan 2016 20:33:09 +0000 (21:33 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 20 Jan 2016 20:33:09 +0000 (21:33 +0100)
commit77a5314c15b49ef717a84186d74b5717b0405dfe
tree9dfa030b3f51e2594c18597ee9c9bd97e0770072
parent578cb5704083904536a81236fd5e0089302e7016
parentb3e932ca97aef9d426319dead781ea59c92af092
Merge branch 'dev' into feature/haystack
app/sandbox/settings.py