]> git.parisson.com Git - timeside-diadems.git/commitdiff
projects / timeside-diadems.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fe1bf6 720cf26)
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Wed, 9 Apr 2014 00:02:40 +0000 (02:02 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Wed, 9 Apr 2014 00:02:40 +0000 (02:02 +0200)
Conflicts:
setup.py
timeside/__init__.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.