]> git.parisson.com Git - timeside.git/commitdiff
projects / timeside.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1813ed 0dc5e6a)
Merge branch 'dev' into feature/jobs
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 13 Mar 2015 19:49:08 +0000 (20:49 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 13 Mar 2015 19:49:08 +0000 (20:49 +0100)
1  2 
setup.py patch | diff1 | diff2 | blob | history

diff --cc setup.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.