1
Merge branch 'master' of https://github.com/douarime/protoDoc

Conflicts:
	docs/source/index.rst
index
m
2
Merge branch 'master' of https://github.com/douarime/protoDoc

Conflicts:
	docs/source/conf.py