Skip to content

Commit

Permalink
Release v2.6
Browse files Browse the repository at this point in the history
Merge pull request #242 from lipkau/release/v2.6
  • Loading branch information
lipkau authored May 4, 2018
2 parents 4beb04d + dc1b1e8 commit 4ab595a
Show file tree
Hide file tree
Showing 128 changed files with 1,849 additions and 1,031 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ root = true
[*]
indent_style = space
indent_size = 4
end_of_line = crlf
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
Expand Down
19 changes: 10 additions & 9 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,16 @@ CHANGELOG.md merge=union
*.md text
*.gitattributes text

# Declare files that will always have CRLF line endings on checkout.
*.ps1 text eol=crlf
*.psm1 text eol=crlf
*.psd1 text eol=crlf
*.psc1 text eol=crlf
*.ps1xml text eol=crlf
*.clixml text eol=crlf
*.xml text eol=crlf
*.txt text eol=crlf
# Declare files that will always have LF line endings on checkout.
*.ps1 text eol=lf
*.psm1 text eol=lf
*.psd1 text eol=lf
*.psc1 text eol=lf
*.ps1xml text eol=lf
*.clixml text eol=lf
*.xml text eol=lf
*.txt text eol=lf
*.md text eol=lf

# Denote all files that are truly binary and should not be mergeable.
*.dll binary
Expand Down
8 changes: 8 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"ms-vscode.PowerShell",
"DavidAnson.vscode-markdownlint"
]
}
16 changes: 5 additions & 11 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Place your settings in this file to overwrite default and user settings.
{
"files.eol": "\r\n",
"files.eol": "\n",
"files.encoding": "utf8",
"files.insertFinalNewline": true,
"files.trimTrailingWhitespace": true,
Expand All @@ -9,13 +9,6 @@
"editor.tabSize": 4,
"editor.insertSpaces": true,

"search.exclude": {
"./Release": true
},
"files.watcherExclude": {
"./Release": true
},

"powershell.codeFormatting.ignoreOneLineBlock": true,
"powershell.codeFormatting.openBraceOnSameLine": true,
"powershell.codeFormatting.newLineAfterOpenBrace": false,
Expand All @@ -28,12 +21,13 @@

"[markdown]": {
"editor.tabSize": 2,
"editor.wordWrap": "on",
"editor.renderWhitespace": "all",
"editor.acceptSuggestionOnEnter": "off",
"editor.trimAutoWhitespace": false
},
"[yaml]": {
"editor.tabSize": 2
},

"markdownlint.config": {
"MD024": false
}
}
Loading

0 comments on commit 4ab595a

Please sign in to comment.