Merge branch 'master' of gitlab.com:mw-internal/microweber-ui

# Conflicts: # index.html
microweber-dev · Apr 28, 2020 · 068dd3e · 068dd3e
2 parents 37a9359 + 31a77b9
commit 068dd3e
Show file tree

Hide file tree

Showing 526 changed files with 100,810 additions and 1,702 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/grunt/node_modules
+/nbproject/private/
diff --git a/assets/img/logo-mobile.svg b/assets/img/logo-mobile.svg
diff --git a/assets/img/logo.svg b/assets/img/logo.svg
diff --git a/assets/img/no_categories.svg b/assets/img/no_categories.svg
diff --git a/assets/img/no_content.svg b/assets/img/no_content.svg
diff --git a/assets/img/no_notifications.svg b/assets/img/no_notifications.svg
diff --git a/assets/img/no_products.png b/assets/img/no_products.png
diff --git a/assets/img/no_products.svg b/assets/img/no_products.svg