]> git.parisson.com Git - timeside.git/commitdiff
Merge branch 'dev' of github.com:yomguy/TimeSide into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Sat, 22 Mar 2014 19:55:50 +0000 (20:55 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Sat, 22 Mar 2014 19:55:50 +0000 (20:55 +0100)
1  2 
MANIFEST.in

diff --cc MANIFEST.in
Simple merge