]> git.parisson.com Git - timeside-diadems.git/commitdiff
projects / timeside-diadems.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1cb5db ac86146)
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Jul 2014 10:05:53 +0000 (12:05 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Jul 2014 10:05:53 +0000 (12:05 +0200)
Conflicts:
README.rst
setup.py
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.