una bosta
Merge branch 'master' of github.com:Litocruz/sso

Conflicts:
	log/localeapp.yml
borre localapp