Browse Source

Merge branch 'master' of https://github.com/yuzhengyang/Fork

# Conflicts:
#	Azylee.Utils/.vs/Azylee.Utils/v15/Server/sqlite3/storage.ide
yuzhengyang 7 years ago
parent
commit
1fd42a5582
1 changed files with 1 additions and 0 deletions
  1. 1 0
      .gitignore

+ 1 - 0
.gitignore

@@ -329,3 +329,4 @@ ASALocalRun/
 
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
+/Azylee.Utils/.vs