Merge branch '0.3' into develop

Conflicts:
	Makefile
	requirements-dev.txt
This commit is contained in:
Romain Dorgueil
2017-06-10 14:17:26 +02:00
4 changed files with 18 additions and 5 deletions

View File

@ -1 +1 @@
__version__ = '0.3.1'
__version__ = '0.3.2'