[geeklog-hg] [Geeklog-Core/geeklog] e184cc: Merge branch 'P2Tera-patch-1'

[Kenji ITO]

  Branch: refs/heads/master
  Home:   https://github.com/Geeklog-Core/geeklog
  Commit: e184ccad295f01c504729fc10b5c646ae30834b1
      https://github.com/Geeklog-Core/geeklog/commit/e184ccad295f01c504729fc10b5c646ae30834b1
  Author: mystralkk <mystralkk at gmail.com>
  Date:   2019-08-22 (Thu, 22 Aug 2019)

  Changed paths:
    M plugins/spamx/language/japanese_utf-8.php

  Log Message:
  -----------
  Merge branch 'P2Tera-patch-1'


  Commit: 948c4831185d35eac0c572b10af63e22a69e5d56
      https://github.com/Geeklog-Core/geeklog/commit/948c4831185d35eac0c572b10af63e22a69e5d56
  Author: mystralkk <mystralkk at gmail.com>
  Date:   2019-08-22 (Thu, 22 Aug 2019)

  Changed paths:

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


Compare: https://github.com/Geeklog-Core/geeklog/compare/9e345d8a9332...948c4831185d