]> git.parisson.com Git - timeside.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 23 Oct 2014 08:32:30 +0000 (10:32 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 23 Oct 2014 08:32:30 +0000 (10:32 +0200)
commita5a083133f342aabc36387d65a61bce087751554
treee4e6618b2c1b2d6c67a213167a8ed204762e63f8
parent80749a2ab6a877feb32aca62af7a8f6f391bee22
parent4a9e6e43b97913fbdc1fbc38ff72b4618b8be45e
Merge branch 'dev'

Conflicts:
README.rst
README.rst