[geeklog-hg] [Geeklog-Core/geeklog] 86cc35: Merge remote-tracking branch 'origin/master'

[Kenji ITO]

  Branch: refs/heads/master
  Home:   https://github.com/Geeklog-Core/geeklog
  Commit: 86cc35700aaf27fe7ccb70b0f5fcecdb26539c24
      https://github.com/Geeklog-Core/geeklog/commit/86cc35700aaf27fe7ccb70b0f5fcecdb26539c24
  Author: mystralkk <mystralkk at gmail.com>
  Date:   2019-09-02 (Mon, 02 Sep 2019)

  Changed paths:
    M public_html/docs/english/config.html
    M public_html/docs/japanese/config.html
    M public_html/layout/denim/css_ltr/additional.css
    M public_html/layout/denim/css_rtl/additional.css
    M public_html/layout/denim_curve/css_ltr/additional.css
    M public_html/layout/denim_curve/css_rtl/additional.css
    M public_html/layout/denim_three/css_ltr/additional.css
    M public_html/layout/denim_three/css_rtl/additional.css
    M public_html/layout/modern_curve/css/additional.css
    M public_html/lib-common.php
    M system/lib-user.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 4e1856bb2bbca75f3c1d72059d55da4e13053d9f
      https://github.com/Geeklog-Core/geeklog/commit/4e1856bb2bbca75f3c1d72059d55da4e13053d9f
  Author: mystralkk <mystralkk at gmail.com>
  Date:   2019-09-02 (Mon, 02 Sep 2019)

  Changed paths:
    M build.xml
    M public_html/admin/envcheck.php
    M public_html/admin/install/classes/installer.class.php

  Log Message:
  -----------
  Fixed the location of "filemanager.config.json"


Compare: https://github.com/Geeklog-Core/geeklog/compare/8eadbca4f958...4e1856bb2bbc