]> git.parisson.com Git - timeside-diadems.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)
commitb63fd7a856f6698c6590e6367ec9ad64595e5a25
tree9fb9ed238085ccc083012531e196cd4712968b0a
parentf80a1bb5b0b4f6f7505a911fda90cc3dfd1db87b
parent8f393cad88e30e7c4f3fca834ef8b8bdc8b63b41
Merge branch 'hotfix/manifest' into dev