Eliot Berriot 71188d4578 Merge branch 'develop' into 'coc' ... # Conflicts: # README.rst		2019-03-11 15:22:35 +01:00
..
Bug.md	Merge branch 'develop' into 'coc'	2019-03-11 15:22:35 +01:00
Feature request.md	Merge branch 'develop' into 'coc'	2019-03-11 15:22:35 +01:00