Merge branch 'testing' of https://github.com/DARIAH-DE/Topics into te…

…sting
DARIAH-DE · Feb 15, 2017 · 2f1e561 · 2f1e561
2 parents 370b2f6 + d119794
commit 2f1e561
Show file tree

Hide file tree

Showing 4 changed files with 4,207 additions and 108 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ grenzbote_plain/
 **/IntegrationTest_v01.html
 .python-version
 .tox
+wiki/