downloads
Merge branch 'master' into auth
fix
fix
éxtensões
Merge branch 'master' into auth
gitignore
Merge branch 'master' into auth
fix
gitignore
Merge branch 'auth' into haml

Conflicts:
	config/deploy/production.rb
Merge branch 'haml' of github.com:dudufangor/celtic-ro into haml

Conflicts:
	app/views/users/new.html.haml