]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4dfe33f 6534b95)
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)
Conflicts:
example/sandbox/settings.py

1  2 
example/sandbox/settings.py patch | diff1 | diff2 | blob | history

diff --cc example/sandbox/settings.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.