]> git.parisson.com Git - timeside-diadems.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)
commit188b321003df0940f6f67abe658a42d9bf7a2e8d
treea180202e7ad867a20e6820d9cbca4475a5b43cdc
parent658ba97d9171fe8879308ec96eca648d2a266d75
parent6a29dacd6496550605ad1146b3463f6c19d19d70
Merge branch 'dev'

Conflicts:
README.rst
README.rst