]> git.parisson.com Git - telemeta.git/commit
Merge branch 'feature/haystack' of github.com:Parisson/Telemeta into feature/haystack
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 22 Dec 2015 10:24:12 +0000 (11:24 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 22 Dec 2015 10:24:12 +0000 (11:24 +0100)
commitce0442c0a1d53e462272d13f17eea905a4f0cfe8
tree6539c1bbd9a52fa30c55b1ccb2363b3161704c8f
parent3b8f81fec4e1154cdae80d28c1b8d7fd03663ac3
parentf2a53f76e4abae79950967628b674c576af4f6d4
Merge branch 'feature/haystack' of github.com:Parisson/Telemeta into feature/haystack

Conflicts:
app/sandbox/settings.py
telemeta/locale
telemeta/views/item.py
app/sandbox/settings.py