]> git.parisson.com Git - timeside-diadems.git/commitdiff
projects / timeside-diadems.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 76ba06d 55e3acf)
Merge branch 'dev' into server
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 14 May 2014 22:36:09 +0000 (00:36 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 14 May 2014 22:36:09 +0000 (00:36 +0200)
Conflicts:
timeside/__init__.py

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.