[geeklog-hg] [Geeklog-Core/geeklog] d5837c: Fix for change set a128ce3

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/Geeklog-Core/geeklog
  Commit: d5837c2578c35ad1741301c4cde1684a6dac10cf
      https://github.com/Geeklog-Core/geeklog/commit/d5837c2578c35ad1741301c4cde1684a6dac10cf
  Author: Kenji ITO <mystralkk at gmail.com>
  Date:   2017-01-11 (Wed, 11 Jan 2017)

  Changed paths:
    M public_html/directory.php

  Log Message:
  -----------
  Fix for change set a128ce3


  Commit: 1643e03a3742b038e8418608fbbffd19caeb39ae
      https://github.com/Geeklog-Core/geeklog/commit/1643e03a3742b038e8418608fbbffd19caeb39ae
  Author: Kenji ITO <mystralkk at gmail.com>
  Date:   2017-01-11 (Wed, 11 Jan 2017)

  Changed paths:
    M public_html/directory.php

  Log Message:
  -----------
  Merge branch 'feature/fix-a128ce3'


Compare: https://github.com/Geeklog-Core/geeklog/compare/97fbe920b39e...1643e03a3742