Michael Delpach 50f86ee79a Revert "Revert "Merge branch 'master' of https://github.com/ShareX/ShareX"" ... This reverts commit 85fdab3c56.		2020-07-06 06:37:56 +08:00
..
AssemblyInfo.cs	Update year	2020-02-05 10:19:48 +03:00
Resources.Designer.cs	Revert "Revert "Merge branch 'master' of https://github.com/ShareX/ShareX""	2020-07-06 06:37:56 +08:00
Resources.resx	Fixed multiple capitalization errors which prevented building.	2018-07-17 09:49:53 -04:00