diff options
| author | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-09-21 23:06:01 -0400 |
|---|---|---|
| committer | Jesse Plamondon-Willard <github@jplamondonw.com> | 2017-09-21 23:34:52 -0400 |
| commit | 57d9d28554de79734401a68ee1151fc4e9e0ca83 (patch) | |
| tree | fb7883d03cdf6f479e647e39a09a61bade11a610 /.gitignore | |
| parent | f0e2117f70455bd9883321ae5b0bf40562f2d5de (diff) | |
| parent | 06ed54b2c6c2e1f49d6975a34ea36f685d7f7c49 (diff) | |
| download | SMAPI-57d9d28554de79734401a68ee1151fc4e9e0ca83.tar.gz SMAPI-57d9d28554de79734401a68ee1151fc4e9e0ca83.tar.bz2 SMAPI-57d9d28554de79734401a68ee1151fc4e9e0ca83.zip | |
Merge remote-tracking branch 'dewdrop/master' into feature/update-check-api (#336)
# Conflicts:
# .gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -259,4 +259,6 @@ _Pvt_Extensions # JetBrains Rider .idea/ -*.sln.iml
\ No newline at end of file +*.sln.iml + +Dewdrop/ScaffoldingReadMe.txt |