]> git.parisson.com Git - timeside.git/commit
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)
commit9cd84af15048bb0152cb32a5706ea5e6d16afa8c
tree805a85d0414b2b480009714860ab22b6f0bd4764
parentc1813ed618aa2d089403a9017a698a6e725db5ca
parent0dc5e6a542254e780cf4e95935f348cfac23438d
Merge branch 'dev' into feature/jobs
setup.py