Paula Quispe 2a850ede19 conflicts: merge develop

2021-12-02 11:58:33 -04:00

..

mysql

conflicts: merge develop

2021-12-02 11:58:33 -04:00

oracle

…

partner/mysql

…

pgsql

…

check.data

…