Merge branch 'master' into live-site

add favicon
2018-05-14 18:56:59 +00:00 · 2018-05-14 18:56:51 +00:00
--- a/favicon.ico
+++ b/favicon.ico
@ -0,0 +1 @@
+img/favicon-32x32.png
--- a/img/favicon-32x32.png
+++ b/img/favicon-32x32.png
作者	SHA1	备注	提交日期
AJ ONeal	4bfef46295	Merge branch 'master' into live-site	2018-05-14 18:56:59 +00:00
AJ ONeal	2de3e744a5	add favicon	2018-05-14 18:56:51 +00:00