Merge branch 'develop'

2017-11-14 17:08:44 +01:00 · 2017-11-14 17:08:44 +01:00 · 0d89a459b5
commit 0d89a459b5
parent 6cab4c5b46 56d8437e79
18 changed files with 1 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,3 +1,3 @@
 src/**/*.* filter=git-crypt diff=git-crypt
 .gulp/**/*.* filter=git-crypt diff=git-crypt
-extensions/**/*.ts
+extensions/**/*.ts filter=git-crypt diff=git-crypt
--- a/extensions/commands/accents-setter/index.ts
+++ b/extensions/commands/accents-setter/index.ts
--- a/extensions/commands/theme-icons/index.ts
+++ b/extensions/commands/theme-icons/index.ts
--- a/extensions/commands/theme-variant/index.ts
+++ b/extensions/commands/theme-variant/index.ts
--- a/extensions/consts/files.ts
+++ b/extensions/consts/files.ts
--- a/extensions/consts/paths.ts
+++ b/extensions/consts/paths.ts
--- a/extensions/helpers/changelog.ts
+++ b/extensions/helpers/changelog.ts
--- a/extensions/helpers/fs.ts
+++ b/extensions/helpers/fs.ts
--- a/extensions/helpers/settings.ts
+++ b/extensions/helpers/settings.ts
--- a/extensions/helpers/vscode.ts
+++ b/extensions/helpers/vscode.ts
--- a/extensions/interfaces/iaccent-custom-property.ts
+++ b/extensions/interfaces/iaccent-custom-property.ts
--- a/extensions/interfaces/idefaults.ts
+++ b/extensions/interfaces/idefaults.ts
--- a/extensions/interfaces/igeneric-object.ts
+++ b/extensions/interfaces/igeneric-object.ts
--- a/extensions/interfaces/ipackage.json.ts
+++ b/extensions/interfaces/ipackage.json.ts
--- a/extensions/interfaces/ipaths.ts
+++ b/extensions/interfaces/ipaths.ts
--- a/extensions/interfaces/itheme-custom-properties.ts
+++ b/extensions/interfaces/itheme-custom-properties.ts
--- a/extensions/interfaces/itheme-icons.ts
+++ b/extensions/interfaces/itheme-icons.ts
--- a/extensions/material.theme.config.ts
+++ b/extensions/material.theme.config.ts