[serendipity-cvs] [s9y/Serendipity] c2e3b5: should fix the parse error at least

[GitHub <no...@gi...>]

  Branch: refs/heads/2.0
  Home:   https://github.com/s9y/Serendipity
  Commit: c2e3b5a038f8cc14ec344816505d8ee7cb7240b7
      https://github.com/s9y/Serendipity/commit/c2e3b5a038f8cc14ec344816505d8ee7cb7240b7
  Author: Garvin Hicking <bl...@ga...>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M templates/2k11/admin/upgrader.inc.tpl

  Log Message:
  -----------
  should fix the parse error at least


  Commit: 6b1b4f244833eb6dd66679b88176851a5e9182f9
      https://github.com/s9y/Serendipity/commit/6b1b4f244833eb6dd66679b88176851a5e9182f9
  Author: Garvin Hicking <bl...@ga...>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  Changed paths:
    M templates/2k11/admin/js/gruntipity.php

  Log Message:
  -----------
  Merge branch '2.0' of github.com:s9y/Serendipity into 2.0


Compare: https://github.com/s9y/Serendipity/compare/9808c57f1e0c...6b1b4f244833