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

# Conflicts: # chatops/bash/handler_build
2016-11-30 16:31:50 +01:00
parent 3e54e96c7b 095e154b36
commit 60aadd228a
10 changed files with 159 additions and 68 deletions
--- a/xml/source/futurework.xml
+++ b/xml/source/futurework.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section id="futurework" xml:base="futurework.xml" break="before" inexecsummary="no">
  <title>Future Work</title>
+  <p>
+    <ul>
+      <li>
+        <b>Title</b><br/>
+        Description
+      </li>
+    </ul>
+  </p>
 </section>