Merge pull request testerSunshine#4 from testerSunshine/master

merge
xumingxingsjtu · Jan 15, 2019 · 1fa7d11 · 1fa7d11
2 parents 1deb2b2 + 524c48a
commit 1fa7d11
Show file tree

Hide file tree

Showing 30 changed files with 274 additions and 689 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,9 @@
+**/*.html
+**/*.pyc
+**/*.yaml
+**/*.log
+**/*~
+**/.DS_Store
+**/Thumbs.db
+.idea/
+.git/
diff --git a/.idea/12306.iml b/.idea/12306.iml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/markdown-exported-files.xml b/.idea/markdown-exported-files.xml
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml