Merge branch 'master' of http://rungit.jxdsy.cn:10000/xys/108

# Conflicts: # .gitignore

Merge branch 'master' of http://rungit.jxdsy.cn:10000/xys/108
# Conflicts: # .gitignore
a641b4a5 · xieyishang · d43391e3 · f9810a5a · a641b4a5
Commit a641b4a5 authored Mar 15, 2021 by xieyishang
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

.gitignore .gitignore +8 -1

No files found.
--- a/.gitignore
+++ b/.gitignore
-/runtime
+.idea
+composer.lock
+*.log
+.vscode
+/application/database.php
+/application/config.php
+/runtime/