Rodrigo Quelca 5011ba6b76 fix merge conflicts

2020-12-18 19:28:38 +00:00

..

databases.php

Renaming connection 'report' to 'rp'

2020-07-27 19:54:47 +00:00

environments.php

…

execute-query-blacklist.ini

…

mobile.ini

PMC-1061

2019-08-14 12:35:05 -04:00

mobileios.pem

PMC-200

2018-12-18 14:20:31 -04:00

paths.php

…

propel.ini

…

propel.mssql.ini

…

propel.mysql.ini

…

propel.mysqli.ini

…

propel.oracle.ini

…

propel.pgsql.ini

…

properties.ini

…

rbac.ini

…

rest-config.ini.dist

…

schema.xml

fix merge conflicts

2020-12-18 19:28:38 +00:00