Marcus Bointon
0756c72a64
Merge remote-tracking branch 'origin/master'
# Conflicts:
# .gitignore
# chatops/bash/handler_build
# chatops/bash/handler_convert
# chatops/bash/handler_invoice
# chatops/bash/handler_pentest
# chatops/bash/handler_quickscope
# chatops/bash/handler_quote
# chatops/bash/handler_ratecard
# chatops/bash/handler_validate
# chatops/python/docbuilder.py
# chatops/python/gitlab-to-pentext.py
# chatops/python/pentext_id.py
# chatops/python/validate_report.py
# scripts/gitlab-to-pentext.py
# xml/RELEASE_NOTES.md
# xml/doc/examples/exampleofferte.xml
# xml/doc/examples/examplereport.xml
# xml/dtd/common.xsd
# xml/dtd/genericdocument.xsd
# xml/dtd/invoice.xsd
# xml/dtd/offerte.xsd
# xml/dtd/pentestreport.xsd
# xml/dtd/quickscope.xsd
# xml/graphics/logo_alt.png
# xml/rosbot/fop.conf
# xml/source/client_info.xml
# xml/source/quickscope.xml
# xml/source/snippets/localisationstrings.xml
# xml/source/snippets/offerte/en/aboutus.xml
# xml/source/snippets/offerte/en/conditions.xml
# xml/source/snippets/offerte/en/conditions_code-audit.xml
# xml/source/snippets/offerte/en/engagementtime.xml
# xml/source/snippets/offerte/en/generaltermsandconditions.xml
# xml/source/snippets/offerte/en/introandscope.xml
# xml/source/snippets/offerte/en/methodology_code-audit.xml
# xml/source/snippets/offerte/en/planningandpayment.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/source/snippets/offerte/en/waiver.xml
# xml/source/snippets/offerte/nl/engagementtime.xml
# xml/source/snippets/offerte/nl/generaltermsandconditions.xml
# xml/source/snippets/offerte/nl/planningandpayment.xml
# xml/source/snippets/offerte/nl/projectoverview.xml
# xml/source/snippets/offerte/nl/waiver.xml
# xml/source/snippets/ratecard/ratecard.xml
# xml/source/snippets/report/methodology.xml
# xml/source/snippets/snippetselection.xml
# xml/templates/offerte/offerte_EN.xml
# xml/templates/offerte/offerte_NL.xml
# xml/xslt/auto.xslt
# xml/xslt/block.xslt
# xml/xslt/findings.xslt
# xml/xslt/generate_contract.xsl
# xml/xslt/generate_document.xsl
# xml/xslt/generate_invoice.xsl
# xml/xslt/generate_offerte.xsl
# xml/xslt/generate_ratecard.xsl
# xml/xslt/generate_report.xsl
# xml/xslt/graphics.xslt
# xml/xslt/info2contract.xsl
# xml/xslt/inline.xslt
# xml/xslt/ir2offerte.xsl
# xml/xslt/lists.xslt
# xml/xslt/localisation.xslt
# xml/xslt/meta.xslt
# xml/xslt/numbering.xslt
# xml/xslt/off2inv.xsl
# xml/xslt/off2rep.xsl
# xml/xslt/pages.xslt
# xml/xslt/placeholders.xslt
# xml/xslt/qs2offerte.xsl
# xml/xslt/rep2off.xsl
# xml/xslt/structure.xslt
# xml/xslt/styles.xslt
# xml/xslt/styles_inv.xslt
# xml/xslt/styles_off.xslt
# xml/xslt/styles_rat.xslt
# xml/xslt/styles_rep.xslt
# xml/xslt/table.xslt
# xml/xslt/toc.xslt
# xml/xslt/waiver.xslt
2019-08-21 11:32:24 +02:00
..
2019-02-12 15:28:17 +01:00
2019-02-12 15:28:17 +01:00
2018-09-13 10:34:35 +02:00
2019-01-21 15:44:18 +01:00
2019-01-21 15:44:18 +01:00
2018-09-13 10:34:35 +02:00
2018-09-13 10:34:35 +02:00
2018-09-13 10:34:35 +02:00
2016-07-25 22:49:31 -07:00
2018-09-13 10:34:35 +02:00
2018-09-13 10:34:35 +02:00
2016-07-25 22:49:31 -07:00
2016-07-25 22:49:31 -07:00
2016-07-25 22:49:31 -07:00
2016-07-25 22:49:31 -07:00
2016-07-25 22:49:31 -07:00
2016-07-25 22:49:31 -07:00
2016-07-25 22:49:31 -07:00
2018-09-13 10:34:35 +02:00
2018-09-13 10:34:35 +02:00
2018-09-13 10:34:35 +02:00
2016-07-25 22:49:31 -07:00
