no message
dejamos de seguirte
Merge branch 'master' of https://github.com/aitoroses/danux into Pruebas

Conflicts:
	public/semiems/js/tabs/default-ck.js
	public/semiems/js/tabs/default.js
Merge pull request #21 from aitoroses/master

Historial preparado! :D
no message
Cambios visuales
Merge pull request #22 from aitoroses/master

Deletes
Añadidos visuales
Merge pull request #29 from danibram/master

Cambios visuales!