]> git.parisson.com Git - timeside.git/commit
Merge branch 'dev' into parameters_with_traits
authorThomas Fillon <thomas@parisson.com>
Tue, 27 May 2014 11:33:59 +0000 (13:33 +0200)
committerThomas Fillon <thomas@parisson.com>
Tue, 27 May 2014 11:33:59 +0000 (13:33 +0200)
commitbc4b88629da9cd66384d4c5d313aaad8c38dd712
tree1e509a7aa0402f1ca011afd1736e597ef0cdccfb
parent2ea2feb6434282d6295adfa73055db680d4ea5fe
parentd39da7ff74ee21dc3c050531c9f591a450162e9a
Merge branch 'dev' into parameters_with_traits
timeside/core.py