Paula V. Quispe 0872b7208e I solved the conflicts

2015-03-31 15:42:44 -04:00

..

engine

I solved the conflicts

2015-03-31 15:42:44 -04:00

public_html

I solved observations in class.bootstrap.php and sysGeneric.php

2015-03-31 15:29:15 -04:00