Dmitriy Zaporozhets 67d6a79ee9 Merge branch 'ce-ee-master' into ee-master ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb

2014-10-22 14:47:04 +03:00

..

images

Improve login page behaviour

2014-07-13 20:56:29 +03:00

javascripts

Merge branch 'feature-multi-ldap-servers-merge-master' into feature-multi-ldap-servers-group-sync

2014-10-15 14:50:24 +02:00

stylesheets

Merge branch 'ce-ee-master' into ee-master

2014-10-22 14:47:04 +03:00