Gustavo Cruz 5ab3033871 Merge changes manually due to conflicts with the upstream master branch.

2015-03-23 09:25:22 -04:00

..

databases.php

Correccion de errores stdclass

2014-07-03 09:45:15 -04:00

environments.php

…

paths.php

…

propel.ini

…

propel.mssql.ini

…

propel.mysql.ini

…

propel.oracle.ini

…

propel.pgsql.ini

…

properties.ini

…

rbac.ini

…

rest-config.ini.dist

…

schema.xml

Merge changes manually due to conflicts with the upstream master branch.

2015-03-23 09:25:22 -04:00