Merge branch 'master' of https://github.com/EngineeringSPA/SpagoBI

Conflicts: mkdocs.yml
SpagoBILabs · Oct 13, 2015 · 2723954 · 2723954
2 parents 967055b + f23cf20
commit 2723954
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/doc/user/NGSI/index.md b/doc/user/NGSI/index.md
@@ -0,0 +1,3 @@
+# Introduction
+
+Welcome to the SpagoBI NGSI User & Programmer's Manual