Merge upstream

This commit is contained in:
Cyberboss
2017-11-01 09:59:11 -04:00
6 changed files with 58 additions and 18 deletions
+4
View File
@@ -158,3 +158,7 @@ Just becuase something isn't on this list doesn't mean that it's acceptable. Use
Yes, we know that the files have a tonne of mixed Windows and Linux line endings. Attempts to fix this have been met with less than stellar success, and as such we have decided to give up caring until there comes a time when it matters.
Therefore, EOF settings of main repo are forbidden territory one must avoid wandering into, at risk of losing body and/or mind to the Git gods.
## Other Notes
* Feel free to add your nuget account to TGServiceInterface/Packages.nuspec authors list if you modify the interface