]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into feature/ts-0.5
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 21:52:12 +0000 (22:52 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 20 Jan 2014 21:52:12 +0000 (22:52 +0100)
commitb2fb16a06554068562da5403f141e157bafe64cf
treecdb31cdacb4a62b71f14aa6ed1a47e75b440a086
parent4dfe33f052f631d228bd28d06c1314c86fc7cc01
parent6534b9593a9aff2d6f5e18de8d87371165d920b4
Merge branch 'dev' into feature/ts-0.5

Conflicts:
example/sandbox/settings.py
example/sandbox/settings.py