Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop

2019-10-09 14:00:51 +08:00 · 2019-10-09 14:00:51 +08:00 · 14fafc1709
parent f4bc7d1af7 1d37a044eb
commit 14fafc1709
1 changed files with 1 additions and 1 deletions
--- a/app/views/account/_introduce.html.erb
+++ b/app/views/account/_introduce.html.erb
@ -231,7 +231,7 @@
      <a href="https://www.ccf.org.cn/" target="_blank">
        <div>
            <span class="imgLoGO"><img src="/images/introduce/CCF.png" /></span>
-            <span class="name">中国计算机协会</span>
+            <span class="name">中国计算机学会</span>
        </div>
      </a>
      <a href="http://www.cmooc.cn/" target="_blank">