jennylee f6788b35d5 Resolving conflicts

2015-03-26 18:14:51 -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

Resolving conflicts

2015-03-26 18:14:51 -04:00