]> git.parisson.com Git - timeside.git/commit
Merge branch 'dev'
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 24 Oct 2014 17:20:57 +0000 (19:20 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 24 Oct 2014 17:20:57 +0000 (19:20 +0200)
commit8374fadaa46ea0dfd45587ee9c5a57adf4a16505
treec2b5c2eb060e6e9f7975b7b346fe700cdb9e4c1b
parent77f4c97d4547dd9ace8f5322d22c1799cc786b6b
parentf2307cd8e2d8b869e159bc68cf67adaaaf38dc5b
Merge branch 'dev'