[geeklog-hg] [Geeklog-Core/geeklog] ed092e: Fixed a wrong entry

[Kenji ITO]

  Branch: refs/heads/master
  Home:   https://github.com/Geeklog-Core/geeklog
  Commit: ed092e3830b3fcf0ad82ca61111dd11b4d5211c5
      https://github.com/Geeklog-Core/geeklog/commit/ed092e3830b3fcf0ad82ca61111dd11b4d5211c5
  Author: mystralkk <mystralkk at gmail.com>
  Date:   2020-01-12 (Sun, 12 Jan 2020)

  Changed paths:
    M plugins/links/language/english_utf-8.php

  Log Message:
  -----------
  Fixed a wrong entry


  Commit: 5c68a819b3700c5e7fb66d799a48eb4ca1fdb6e9
      https://github.com/Geeklog-Core/geeklog/commit/5c68a819b3700c5e7fb66d799a48eb4ca1fdb6e9
  Author: mystralkk <mystralkk at gmail.com>
  Date:   2020-01-12 (Sun, 12 Jan 2020)

  Changed paths:
    A plugins/recaptcha/language/english_utf-8.php

  Log Message:
  -----------
  Added "english_utf-8.php" for consistency


  Commit: 9968a88b0d09ca08762e9c4152881bb295340855
      https://github.com/Geeklog-Core/geeklog/commit/9968a88b0d09ca08762e9c4152881bb295340855
  Author: mystralkk <mystralkk at gmail.com>
  Date:   2020-01-12 (Sun, 12 Jan 2020)

  Changed paths:
    M language/english.php
    M language/english_utf-8.php
    M public_html/article.php
    M public_html/docs/english/config.html
    M public_html/staticpages/index.php
    M system/lib-article.php

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/Geeklog-Core/geeklog


Compare: https://github.com/Geeklog-Core/geeklog/compare/eb6a4b737507...9968a88b0d09