adodb/adodb-pear.inc.php, branch v5.22.11-lscadodb PHP Database Abstraction Layer
https://git.rdm1.uk/adodb/.git/atom?h=v5.22.11-lsc2021-08-16T22:48:04ZRedo Merge branch 'hotfix/5.21' Standardized file headers2021-08-16T22:48:04ZDamien Regaddregad@mantisbt.org2021-08-16T22:48:04Zurn:sha1:d558d101c514beeb8c91f65ae61d106b201dc472
Try to do it right this time...
# Conflicts:
# adodb-memcache.lib.inc.php
Fixes #751
Reset version to avoid merge conflicts2021-08-16T22:31:23ZDamien Regaddregad@mantisbt.org2021-08-16T22:31:23Zurn:sha1:eea4fc59246a14083e07949e4d54ac806ebbacce
Fixes #751
Revert changes since Standardized file headers merge2021-08-16T22:30:04ZDamien Regaddregad@mantisbt.org2021-08-16T22:30:04Zurn:sha1:507466ef798b18a3a8830230cfcd51bb488513cf
The conflicts resolution applied when merging the Standardized file
headers (commit e9dcce3df24912ad869d0193f0b419f2309101fc) was seriously
messed up, actually overwriting a number of changes in the master
branch.
Rather than trying to go and fix things one by one which has a high risk
of messing things further, it's easier to redo the merge from a clean
slate, so this commit reverts the following:
- "Merge branch 'hotfix/5.21' Standardized file headers",
e9dcce3df24912ad869d0193f0b419f2309101fc
- "Merge tag 'v5.21.1'",
5f437df3104159d5d659f60e31bef8d33c34995f
- "Reset version to 5.22.0-dev"
af9234a525c3255af051a330164486d73be4c63a
- "Fix incorrect resolution of merge conflicts"
a6733f61b0165b366c8d2c70d9af82edc3881951.
- "Fix syntax error in toexport.inc.php"
20b01e83cb61b6b2460f64c7d1277c5f4cc28574.
Fixes #751
Standard file header: /2021-08-14T11:09:22ZDamien Regaddregad@mantisbt.org2021-04-25T10:19:28Zurn:sha1:32444a6b2e388e775800ecb428106ddd60b3c888Bump version to 5.21.1-dev2021-03-08T17:38:28ZDamien Regaddregad@mantisbt.org2021-03-08T17:38:28Zurn:sha1:27a03b4aa9f01924741c77d8fbe0df3d44374cefBump version to 5.21.02021-02-27T11:38:53ZDamien Regaddregad@mantisbt.org2021-02-27T11:38:53Zurn:sha1:199391f639a0b3346a80d66c00c87230fa3e6a07Bump version to 5.21.0-rc.12021-02-01T23:45:03ZDamien Regaddregad@mantisbt.org2021-02-01T23:44:35Zurn:sha1:dd42240492b4d2e8c4cc3fc36c55571326c8421aBump version to 5.21.0-beta.12020-12-19T23:25:48ZDamien Regaddregad@mantisbt.org2020-12-19T23:25:48Zurn:sha1:ebaf05de4dc33c559686ce6726d6451b62edde7aCodespell assisted typo cleaning2019-11-12T12:46:19ZJean-Michel Vourgèrenirgal@debian.org2019-11-04T21:10:48Zurn:sha1:064f2f108c0b9781b61b353442691099f5e79845Merge branch 'hotfix/5.20'2018-03-30T17:29:59ZDamien Regaddregad@mantisbt.org2018-03-30T17:29:59Zurn:sha1:4011379abe34845d44612dbe904f435b6cd81d9f
Conflicts:
adodb.inc.php
docs/changelog.md