Merge branch 'master' into NDS36-teamcity

# Conflicts: # package-lock.json # package.json
nice-digital · Jan 15, 2018 · 92ec3d7 · 92ec3d7
2 parents 8f58fc0 + 3f321da
commit 92ec3d7
Show file tree

Hide file tree

Showing 19 changed files with 6,955 additions and 1,172 deletions.
diff --git a/bower.json b/bower.json
@@ -40,6 +40,6 @@
     ".grunt-tasks"
   ],
   "dependencies": {
-    "nice-icons": "^1.0.0"
+    "nice-icons": "^1.4.0"
   }
 }
diff --git a/dist/docs/sass/nice-design-system.json b/dist/docs/sass/nice-design-system.json
diff --git a/dist/javascripts/nice.dev.js b/dist/javascripts/nice.dev.js
diff --git a/dist/javascripts/nice.dev.map b/dist/javascripts/nice.dev.map
diff --git a/dist/javascripts/nice.min.js b/dist/javascripts/nice.min.js
diff --git a/dist/stylesheets/nice.css b/dist/stylesheets/nice.css
diff --git a/dist/stylesheets/nice.css.map b/dist/stylesheets/nice.css.map
diff --git a/dist/stylesheets/nice.min.css b/dist/stylesheets/nice.min.css
diff --git a/dist/stylesheets/nice.min.css.map b/dist/stylesheets/nice.min.css.map