summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-01-05 20:18:16 -0500
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2020-01-05 20:18:16 -0500
commitf976b5c0f095a881fc20f6ce5dcf5a50ebb2b5da (patch)
tree260fa7579e1c361283bda09c2616783c3fdb5b9a /.gitignore
parentd34f369d35290bca96cc7225d9765d1a8a66fa8b (diff)
parent48959375b9ef52abf7c7a9404d43aac6ba780047 (diff)
downloadSMAPI-f976b5c0f095a881fc20f6ce5dcf5a50ebb2b5da.tar.gz
SMAPI-f976b5c0f095a881fc20f6ce5dcf5a50ebb2b5da.tar.bz2
SMAPI-f976b5c0f095a881fc20f6ce5dcf5a50ebb2b5da.zip
Merge branch 'develop' into stable
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 65695211..5450a2f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,9 @@ _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
+# Rider
+.idea/
+
# NuGet packages
*.nupkg
**/packages/*
@@ -31,4 +34,4 @@ appsettings.Development.json
src/SMAPI.Web.LegacyRedirects/aws-beanstalk-tools-defaults.json
# Azure generated files
-src/SMAPI.Web/Properties/PublishProfiles/smapi-web-release - Web Deploy.pubxml
+src/SMAPI.Web/Properties/PublishProfiles/*.pubxml