From: Edward Date: Mon, 15 Apr 2019 04:53:26 +0000 (+0800) Subject: Merge branch 'master' of http://git.roojs.com/Pman.Core X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=0280a4e403d14ba7108d037e441da70094f73719;hp=17a62868210d1a4bdce42f63e076af95356d201a Merge branch 'master' of git.roojs.com/Pman.Core --- diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php index 971d0d6e..3f52fb5a 100644 --- a/DataObjects/I18n.php +++ b/DataObjects/I18n.php @@ -128,7 +128,6 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject $this->selectAdd(" i18n_translate(ltype, lkey, 'en') as lval_en - "); } diff --git a/GnumericToExcel.php b/GnumericToExcel.php index bcf1a63d..d8da8da2 100644 --- a/GnumericToExcel.php +++ b/GnumericToExcel.php @@ -111,5 +111,5 @@ class Pman_Core_GnumericToExcel extends Pman } - + }