Merge remote-tracking branch 'origin/master'

# Conflicts: # templates/footer.html
guohongze · Jan 10, 2019 · 230ca80 · 230ca80
2 parents 6c69c18 + 2f9223f
commit 230ca80
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/templates/footer.html b/templates/footer.html
@@ -4,4 +4,4 @@
     </div>
     <!-- Default to the left bar -->
     <a href="http://adminset.cn" target="view_window">AdminSet</a> v0.41-beta
-  </footer>
+  </footer>