]> git.parisson.com Git - timeside.git/commit
Merge branch 'dev' into server
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 16 Dec 2013 16:55:49 +0000 (17:55 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 16 Dec 2013 16:55:49 +0000 (17:55 +0100)
commitac7e615502008b132082ea82ca98b2abb32a95cb
treeba90c0929563abd18cf14d7dd9aac41e49da1f8c
parentb8f92fbbecb7cee04e68b23e08b90744f6acd3c8
parenta6ada08c46bd7bc586372f878deb870c6d27556f
Merge branch 'dev' into server