diff options
| author | Damien Regad <dregad@mantisbt.org> | 2018-08-06 18:27:12 +0200 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2018-08-06 18:27:12 +0200 |
| commit | ac34e7169b9667ba862e8771415281b2a9bcecb9 (patch) | |
| tree | 706737111e39c6a29477649fae73d5d2936d2147 /adodb-active-recordx.inc.php | |
| parent | 980aa9965bfabddc0eb0be5dfc1fcf3c73899e8b (diff) | |
| parent | 748c0748477f328a23300bae80f88cc606a6d7a2 (diff) | |
| download | adodb-ac34e7169b9667ba862e8771415281b2a9bcecb9.tar.gz adodb-ac34e7169b9667ba862e8771415281b2a9bcecb9.tar.bz2 adodb-ac34e7169b9667ba862e8771415281b2a9bcecb9.zip | |
Merge branch 'hotfix/5.20' (v5.20.13)
# Conflicts:
# adodb-time.inc.php
# docs/changelog.md
# drivers/adodb-mssql.inc.php
# drivers/adodb-mssqlnative.inc.php
# drivers/adodb-oci8po.inc.php
Diffstat (limited to 'adodb-active-recordx.inc.php')
| -rw-r--r-- | adodb-active-recordx.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/adodb-active-recordx.inc.php b/adodb-active-recordx.inc.php index 986cbf96..3943c0b2 100644 --- a/adodb-active-recordx.inc.php +++ b/adodb-active-recordx.inc.php @@ -4,7 +4,7 @@ @version v5.21.0-dev ??-???-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community - Latest version is available at http://adodb.sourceforge.net + Latest version is available at http://adodb.org/ Released under both BSD license and Lesser GPL library license. Whenever there is any discrepancy between the two licenses, |