Adding salt init
Adding Salt init
Merge branch 'master' of git://github.com/c2is/BigfootUserBundle
Remove same init
Introducing versioning
Merge branch 'master' of git://github.com/c2is/BigfootUserBundle
Versioning
Update composer.json
extends BaseController
Refacto

Conflicts:

	Entity/BigfootUser.php
Refacto
Fixe roles
Refacto
Refacto
Merge branch 'refacto'
Update composer.json

Versioning
Merge branch 'refacto' of git://github.com/c2is/BigfootUserBundle into refacto

Conflicts:
	DataFixtures/ORM/LoadBigfootUserData.php
	Entity/BigfootUser.php
	Resources/views/Security/login.html.twig
Merge branch 'refacto'
Menu