Merge remote-tracking branch 'origin/crose_work' into crose_work

b1d08646 · Carsten Rose · 3c34e763 · 318a4123 · b1d08646 · b1d08646
Commit b1d08646 authored Feb 24, 2017 by Carsten Rose
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@
 /css
 /fonts
 /qfq.flowchart.dia.autosave
-/qfq*.zip
 /support
 /extension/Resources/Public/fonts
 /extension/Resources/Public/JavaScript

--- a/qfq.zip
+++ b/qfq.zip