Marin Jankovski af5ea92cc4 Merge branch 'master' into login_page ...

Conflicts:
	CHANGELOG

2014-04-07 20:13:37 +02:00

..

_new_base.html.haml

Style devise views

2014-01-01 20:53:44 +02:00

_new_ldap.html.haml

Style devise views

2014-01-01 20:53:44 +02:00

_oauth_providers.html.haml

Remove unnecessary sign *

2014-04-07 18:59:10 +03:00

new.html.haml

Add option for disable standard signin.

2014-04-07 17:11:06 +02:00