Merge remote-tracking branch 'origin/5.2' into 5.2

1c16536f · sgjj · f28a00e5 · 37cffefb · f28a00e5 · f28a00e5
Commit 1c16536f authored Oct 29, 2020 by sgjj
--- a/src/main/webapp/templets/1/default/images/level-4.png
+++ b/src/main/webapp/templets/1/default/images/level-4.png
--- a/src/main/webapp/templets/1/default/images/level-5.png
+++ b/src/main/webapp/templets/1/default/images/level-5.png
--- a/src/main/webapp/templets/1/default/images/loading.gif
+++ b/src/main/webapp/templets/1/default/images/loading.gif
--- a/src/main/webapp/templets/1/default/images/logo.png
+++ b/src/main/webapp/templets/1/default/images/logo.png
--- a/src/main/webapp/templets/1/default/images/micro-blog.png
+++ b/src/main/webapp/templets/1/default/images/micro-blog.png
--- a/src/main/webapp/templets/1/default/images/mobile.png
+++ b/src/main/webapp/templets/1/default/images/mobile.png
--- a/src/main/webapp/templets/1/default/images/more.png
+++ b/src/main/webapp/templets/1/default/images/more.png
--- a/src/main/webapp/templets/1/default/images/ms.ico
+++ b/src/main/webapp/templets/1/default/images/ms.ico
--- a/src/main/webapp/templets/1/default/images/new-loading.gif
+++ b/src/main/webapp/templets/1/default/images/new-loading.gif
--- a/src/main/webapp/templets/1/default/images/news.png
+++ b/src/main/webapp/templets/1/default/images/news.png
--- a/src/main/webapp/templets/1/default/images/news2.png
+++ b/src/main/webapp/templets/1/default/images/news2.png
--- a/src/main/webapp/templets/1/default/images/no-comment.png
+++ b/src/main/webapp/templets/1/default/images/no-comment.png
--- a/src/main/webapp/templets/1/default/images/no-data.png
+++ b/src/main/webapp/templets/1/default/images/no-data.png
--- a/src/main/webapp/templets/1/default/images/our_company.jpeg
+++ b/src/main/webapp/templets/1/default/images/our_company.jpeg
--- a/src/main/webapp/templets/1/default/images/pexels-photo-583845.jpeg
+++ b/src/main/webapp/templets/1/default/images/pexels-photo-583845.jpeg
--- a/src/main/webapp/templets/1/default/images/pic.png
+++ b/src/main/webapp/templets/1/default/images/pic.png
--- a/src/main/webapp/templets/1/default/images/pics.png
+++ b/src/main/webapp/templets/1/default/images/pics.png
--- a/src/main/webapp/templets/1/default/images/search.jpg
+++ b/src/main/webapp/templets/1/default/images/search.jpg
--- a/src/main/webapp/templets/1/default/images/search.png
+++ b/src/main/webapp/templets/1/default/images/search.png
--- a/src/main/webapp/templets/1/default/images/talk_online.jpeg
+++ b/src/main/webapp/templets/1/default/images/talk_online.jpeg