skyanth 66d71f4128 Merge branch 'master' of https://github.com/radicallyopensecurity/pentext into development ...

# Conflicts:
#	.gitignore
#	xml/dtd/invoice.xsd
#	xml/source/quickscope.xml
#	xml/xslt/generate_invoice.xsl

2016-10-04 17:02:36 +02:00

..

en

Merge branch 'master' of https://github.com/radicallyopensecurity/pentext into development

2016-10-04 17:02:36 +02:00

nl

Improved/simplified Quickscope, implemented mandays

2016-10-04 15:19:46 +02:00