]> git.parisson.com Git - timeside-diadems.git/commit
projects / timeside-diadems.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit41310a05055488a25f7df58c7389da89f9c0bfa0
tree7f153150b77043fd707b2654aa5be20e9983a911tree | snapshot
parent76ba06da7f44ddca65d9e47bfc2ceb4d1a6928e7commit | diff
parent55e3acfb9da0ab6de105ac11a3b7f3862d0c94cacommit | diff
Merge branch 'dev' into server

Conflicts:
timeside/__init__.py
README.rst diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.