]> git.parisson.com Git - telemeta.git/commit
Merge remote-tracking branch 'origin' into crem
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 10 Jun 2016 15:33:15 +0000 (17:33 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 10 Jun 2016 15:33:15 +0000 (17:33 +0200)
commitd6e2b8d1504c1e7ebf1ffda64007b1ca5515682c
treee8cfec14e299fdee871979f2bc1da02303494121
parent32e8fce02549552d41c3fd0d222d4bdec36dfbdd
parentb8a97d13faa918281e59fbd0eea855f4085fdb72
Merge remote-tracking branch 'origin' into crem
app/settings.py