Merge branch 'master' into next

# Conflicts: # .codacy.yml
Countly · Aug 8, 2018 · 2e15a1f · 2e15a1f
2 parents 4b321fa + 40ba738
commit 2e15a1f
Showing 1 changed file with 27 additions and 1 deletion.
diff --git a/.codacy.yml b/.codacy.yml
@@ -3,4 +3,30 @@ exclude_paths:
   - 'frontend/express/public/javascripts/min/**'
   - 'frontend/express/public/javascripts/utils/**'
   - 'frontend/express/public/javascripts/visualization/**'
-  - 'tests/**' 
+  - 'tests/**' 
+  - 'frontend/express/public/localization/**'
+  - 'frontend/express/public/fonts/**'
+  - 'frontend/express/public/images/**'
+  - 'frontend/express/public/stylesheets/amaranjs/**'
+  - 'frontend/express/public/stylesheets/font-awesome/**'
+  - 'frontend/express/public/stylesheets/ionicons/**'
+  - 'frontend/express/public/stylesheets/material/**'
+  - 'frontend/express/public/stylesheets/selectize/**'
+  - 'bin/backup/**'
+  - 'bin/upgrade/**'
+  - 'bin/**'
+  - 'plugins/*/tests.js'
+  - 'plugins/*/tests/**'
+  - 'plugins/*/frontend/public/localization/**'
+  - 'plugins/*/frontend/public/images/**'
+  - 'plugins/*/node_modules/**'
+  - 'plugins/push/api/parts/apn/**'
+  - 'plugins/push/frontend/public/javascripts/0.mithril.js'
+  - 'test/**' 
+  - '**/json.human.js' 
+  - '**/jssor.slider.min.js' 
+  - '**/chance.js' 
+  - '**/jsonlite.js' 
+  - '**/EmojiPicker.js' 
+  - '**/iframeResizer.js' 
+  - '**/simpleheat.js'