]> git.parisson.com Git - timeside-diadems.git/commit
Merge branch 'dev' into server
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 3 Apr 2014 23:29:54 +0000 (01:29 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 3 Apr 2014 23:29:54 +0000 (01:29 +0200)
commit05371261e91579dbdff0b938aacaecef748c7e28
tree0222e80cde5128b76862b7d825537fe527b60642
parent7ccdcbede0d9061b57be94a847dfca94f109d25f
parent720cf26bd68f4c2a49d9e7d5057a5d40b04af655
Merge branch 'dev' into server
README.rst