diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-07-08 12:54:06 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-07-08 12:54:06 -0400 |
| commit | 1edd98aef027faa768f56cf0b3591e64e20ba096 (patch) | |
| tree | aec210e2b44c9654f29572dd084206a4598896e1 /src | |
| parent | 36930ffd7d363d6afd7f8cac4918c7d1c1c3e339 (diff) | |
| parent | 8743c4115aa142113d791f2d2cd9ba811dcada2c (diff) | |
| download | SMAPI-1edd98aef027faa768f56cf0b3591e64e20ba096.tar.gz SMAPI-1edd98aef027faa768f56cf0b3591e64e20ba096.tar.bz2 SMAPI-1edd98aef027faa768f56cf0b3591e64e20ba096.zip | |
Merge branch 'develop' into stable
Diffstat (limited to 'src')
122 files changed, 5381 insertions, 1752 deletions
diff --git a/src/.editorconfig b/src/.editorconfig index 132fe6cb..4271803d 100644 --- a/src/.editorconfig +++ b/src/.editorconfig @@ -10,6 +10,7 @@ indent_style = space indent_size = 4 insert_final_newline = true trim_trailing_whitespace = true +charset = utf-8 [*.json] indent_size = 2 diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs index cb174d48..d2f2597f 100644 --- a/src/GlobalAssemblyInfo.cs +++ b/ |