823

1f6d6e4c · chenyishuai@singsingenglish.com · a49e1e49 · 1f6d6e4c
Commit 1f6d6e4c authored Aug 23, 2019 by chenyishuai@singsingenglish.com
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

wq wq +7 -0

No files found.
--- a/wq
+++ b/wq
+Merge branch 'dev' of http://git.singsingenglish.com/new-sing/admin into dev
+
+# Please enter a commit message to explain why this merge is necessary,
+# especially if it merges an updated upstream into a topic branch.
+#
+# Lines starting with '#' will be ignored, and an empty message aborts
+# the commit.