Marcus Bointon 346e6f81e8
Merge remote-tracking branch 'origin/master'
# 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
2017-04-13 11:26:29 +02:00
..
2017-03-21 14:11:14 +01:00
2016-11-28 17:53:38 +01:00
2017-03-21 13:15:12 +01:00