]> git.parisson.com Git - timeside-diadems.git/commit
Merge branch 'parameters_with_traits' into dev
authorThomas Fillon <thomas@parisson.com>
Thu, 17 Jul 2014 12:34:06 +0000 (14:34 +0200)
committerThomas Fillon <thomas@parisson.com>
Thu, 17 Jul 2014 12:34:06 +0000 (14:34 +0200)
commitebfc86966a218f448c784cb7d703f8fdd7363f23
treeb559248d55a8ce3efeed0de02e720579bd8e2d74
parenta7955c934dec56658c76f7c523429cb0907eb0db
parent7e6ceee094f73617a8477d7ad4e62871444d24e6
Merge branch 'parameters_with_traits' into dev