Merge changes from master into xbelanch
Updated m8_content(seguretat).txt
Updated m8_content(seguretat).txt
Merge changes from master into xbelanch
Merge changes from master into xbelanch
Merge changes from master into xbelanch
Updated m8_content(seguretat).txt
Merge changes from master into xbelanch
Merge changes from master into xbelanch
Resolving conflicts between 'master' and 'xbelanch'
Merge branch 'master' of https://www.penflip.com/miniops/m8_content-seguretat