Merge branch 'develop' into feature/ut_run_fixes

Pazus · web-flow · commit 94d7dd97fc04 · 2017-03-13T08:37:24.000+03:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,9 +1,10 @@
-
-.gitattributes export-ignore
-.gitignore     export-ignore
-.gitmodules    export-ignore
-.travis.yml    export-ignore
-
-.travis export-ignore
-
-^docs/* linguist-documentation
+.gitattributes            export-ignore
+.gitignore                export-ignore
+.gitmodules               export-ignore
+.travis.yml               export-ignore
+mkdocs.yml                export-ignore
+.travis                   export-ignore
+sonar-project.properties  export-ignore
+^tests/*                  export-ignore
+^development/*            export-ignore
+^docs/*        linguist-documentation
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 # User-specific stuff:
 .idea/
+.sonar/
 site/
 pages/
 release/
