]> git.parisson.com Git - timeside.git/commit
Merge branch 'master' into dev
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Jul 2014 10:05:53 +0000 (12:05 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 11 Jul 2014 10:05:53 +0000 (12:05 +0200)
commitfd8e5abb8bd03555dc37756ceab018a791949dce
treea8790e8d16990df4186c435865f26a1703cf27b2
parent20b188b4315216c2a2398b1ac67216b6efa40968
parent7d506fd79041ca66de400049bea4b18b22f8c73f
Merge branch 'master' into dev

Conflicts:
README.rst
setup.py
timeside/__init__.py
README.rst
timeside/__init__.py