[geeklog-hg] [Geeklog-Core/geeklog] 3bb5fa: Added url_routing config option to Geeklog upgrade

[GitHub]

  Branch: refs/heads/feature/introduce-swiftmailer
  Home:   https://github.com/Geeklog-Core/geeklog
  Commit: 3bb5fa2bfad04c32c6f57f7bcb3bdf18ccaf7a12
      https://github.com/Geeklog-Core/geeklog/commit/3bb5fa2bfad04c32c6f57f7bcb3bdf18ccaf7a12
  Author: Tom Homer <tomhomer at gmail.com>
  Date:   2016-09-08 (Thu, 08 Sep 2016)

  Changed paths:
    M sql/updates/mysql_2.1.1_to_2.1.2.php
    M sql/updates/pgsql_2.1.1_to_2.1.2.php

  Log Message:
  -----------
  Added url_routing config option to Geeklog upgrade


  Commit: 77739b388cef006059b622435ac7711016f0a907
      https://github.com/Geeklog-Core/geeklog/commit/77739b388cef006059b622435ac7711016f0a907
  Author: Tom Homer <tomhomer at gmail.com>
  Date:   2016-09-08 (Thu, 08 Sep 2016)

  Changed paths:
    M system/lib-story.php
    M system/lib-template.php

  Log Message:
  -----------
  Clear cache files on url rewrite and routing config changes


  Commit: 840bf5ea9b8ca60cf4ade0bcf42dcf1a34eda759
      https://github.com/Geeklog-Core/geeklog/commit/840bf5ea9b8ca60cf4ade0bcf42dcf1a34eda759
  Author: Tom Homer <tomhomer at gmail.com>
  Date:   2016-09-08 (Thu, 08 Sep 2016)

  Changed paths:
    M language/english.php
    M language/english_utf-8.php

  Log Message:
  -----------
  Updated english language files for url routing


  Commit: 582aba37a9a2d7d15dda39f8373ff6a8144e414d
      https://github.com/Geeklog-Core/geeklog/commit/582aba37a9a2d7d15dda39f8373ff6a8144e414d
  Author: Kenji ITO <mystralkk at gmail.com>
  Date:   2016-09-09 (Fri, 09 Sep 2016)

  Changed paths:
    M language/english.php
    M language/english_utf-8.php
    M sql/updates/mysql_2.1.1_to_2.1.2.php
    M sql/updates/pgsql_2.1.1_to_2.1.2.php
    M system/lib-story.php
    M system/lib-template.php

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


  Commit: 4fce8784732dd7ac928ed8855f93d8bbfafd3e2f
      https://github.com/Geeklog-Core/geeklog/commit/4fce8784732dd7ac928ed8855f93d8bbfafd3e2f
  Author: Kenji ITO <mystralkk at gmail.com>
  Date:   2016-09-09 (Fri, 09 Sep 2016)

  Changed paths:
    M language/english.php
    M language/english_utf-8.php
    M sql/updates/mysql_2.1.1_to_2.1.2.php
    M sql/updates/pgsql_2.1.1_to_2.1.2.php
    M system/lib-story.php
    M system/lib-template.php

  Log Message:
  -----------
  Merge branch 'master' into feature/introduce-swiftmailer

Conflicts:
	sql/updates/mysql_2.1.1_to_2.1.2.php


Compare: https://github.com/Geeklog-Core/geeklog/compare/a5adf8e13d92...4fce8784732d