]> git.parisson.com Git - timeside-diadems.git/commitdiff
projects / timeside-diadems.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ccdcbe 720cf26)
Merge branch 'dev' into server
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 3 Apr 2014 23:29:54 +0000 (01:29 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 3 Apr 2014 23:29:54 +0000 (01:29 +0200)
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.