346e6f81e8
# Conflicts: # xml/RELEASE_NOTES.md # xml/source/client_info.xml # xml/source/snippets/company_info.xml # xml/source/snippets/offerte/en/conditions.xml # xml/source/snippets/offerte/en/crystal-box.xml # xml/source/snippets/offerte/en/disclaimer.xml # xml/source/snippets/offerte/en/disclaimer_code-audit.xml # xml/source/snippets/offerte/en/examplewaiver.xml # xml/source/snippets/offerte/en/grey-box.xml # xml/source/snippets/offerte/en/introandscope.xml # xml/source/snippets/offerte/en/introandscope_retest.xml # xml/source/snippets/offerte/en/methodology_code-audit.xml # xml/source/snippets/offerte/en/prerequisites_training.xml # xml/source/snippets/offerte/en/projectoverview.xml # xml/source/snippets/offerte/en/projectoverview_retest.xml # xml/source/snippets/offerte/en/projectoverview_training.xml # xml/source/snippets/offerte/en/teamandreporting.xml # xml/xslt/auto.xslt