]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 466ec40 e9e6560)
Merge branch 'dev' of github.com:yomguy/Telemeta into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Sun, 23 Nov 2014 23:26:16 +0000 (00:26 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Sun, 23 Nov 2014 23:26:16 +0000 (00:26 +0100)
1  2 
README.rst patch | diff1 | diff2 | blob | history

diff --cc README.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.