Cambie una cosa facil
Merge branch 'develop'
Chau htaccess
Hola htaccess
Merge branch 'master' into develop
HtAccess esta trackeado de nuevo