modifier liens footer masterpage
minor changes
merge conflicts
Merge branch 'charles' of https://github.com/Denis1507/Sentinelles into charles
Merge branch 'js'
merge:wq
C
D
Merge branch 'nico'
merge