registre
registre
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of C:\Users\RICHARD\PhpstormProjects\SED with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	backend/FILE_MANAGER/Campo.php
	backend/FILE_MANAGER/log.txt
cositas