Merge 4_501 - 632, 5_1400-1656 from CrowsStriker/master

close #14
Apollonyan · Sep 22, 2017 · d567d0e · d567d0e
2 parents 9e6a4fa + 9efd44a
commit d567d0e
Show file tree

Hide file tree

Showing 3 changed files with 577 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,17 @@
 bilicookies
 .vscode
 
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+Desktop.ini
+
 # Xcode
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore