Eliot Berriot 71188d4578 Merge branch 'develop' into 'coc' ... # Conflicts: # README.rst		2019-03-11 15:22:35 +01:00
..
issue_templates	Merge branch 'develop' into 'coc'	2019-03-11 15:22:35 +01:00
merge_request_templates	Added a merge request template and more documentation about the changelog	2018-08-31 19:47:50 +02:00