]> git.parisson.com Git - telemeta.git/commitdiff
Merge tag 'search' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 4 Aug 2017 14:09:10 +0000 (16:09 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 4 Aug 2017 14:09:10 +0000 (16:09 +0200)
Fix advanced search

1  2 
app/settings.py
docker-compose.yml
telemeta/urls.py

diff --cc app/settings.py
Simple merge
Simple merge
Simple merge