]> git.parisson.com Git - timeside.git/commit
Merge branch 'hotfix/manifest' into dev
authoryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 14:10:29 +0000 (16:10 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 2 Oct 2012 14:10:29 +0000 (16:10 +0200)
commite838c9f217d9695542b3a4ec756458a45d08acc7
treea417e5a72d8743c20ca2c237ffb4b1d03517241d
parentf4dbcd4a8ab8bbda2f4a1d8bca330db5a540ca00
parentee8544f6b89ebdf7d7655f3f0f7586d3815951b4
Merge branch 'hotfix/manifest' into dev