James Lopez 3e99123095 Fix merge conflicts - squashed commit ...

# Conflicts:
#	app/models/project.rb

2016-06-03 10:57:49 +02:00

..

identities_controller_spec.rb

Repair ldap_blocked state when no ldap identity exist anymore

2016-01-08 16:26:04 -02:00

impersonations_controller_spec.rb

Fix typo

2016-04-22 21:46:47 +00:00

projects_controller_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00

spam_logs_controller_spec.rb

Fix rubocop offenses

2016-02-02 11:25:44 -02:00

users_controller_spec.rb

Fix merge conflicts - squashed commit

2016-06-03 10:57:49 +02:00