]> git.parisson.com Git - timeside.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)
commitc208876359c8d4c1e36e3b8285e2bfc47d39c24a
treeeb151c7d61a49ecb8f1644283e33b964e2ae3c1c
parent3e638e2cf25d5f7a854aff552a1e82db38a5482b
parentd92efec7d3678e6f4b1b2336ee73e04d7c74104b
Merge branch 'parameters_with_traits' into dev