]> git.parisson.com Git - telemeta.git/commit
Merge remote-tracking branch 'origin' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 4 Feb 2016 15:23:47 +0000 (16:23 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 4 Feb 2016 15:23:47 +0000 (16:23 +0100)
commit94cd431197e0bef5956fe7d8524898c6df72f4b1
tree61b412a2bc6530dd89365ce5674b296912e11c65
parent78ce5ad94c52615a2eb3939cd8b5067db00dddf0
parent5e5cd8bd393ee9db672f8bcda38845efaa2f8d4a
Merge remote-tracking branch 'origin' into crem
app/sandbox/settings.py