Alexei Sorokin 65f1b1e1e3 Fix minor git merge resolving issues il y a 5 ans
..
includes 65f1b1e1e3 Fix minor git merge resolving issues il y a 5 ans
public e1514a151c [DOCUMENTATION][DEVELOPERS][PLUGINS] Some updates to Plugins doc il y a 5 ans