beremiz

Merge, with surprizingly little conflicts

2018-11-23, Edouard Tisserant
15f18dc8b56a
Merge, with surprizingly little conflicts
.project
.directory
.pytest_cache
.cache
.coverage_full
syntax: regexp
^tests/.*/build$
^.idea/.*
syntax: regexp
^.*\.pyc$
syntax: regexp
^.*~$
syntax: regexp
^.*\.swp$
bug_report.*\.txt
i18n/.*.new$
revision
doc/_build
doc/locale