Jan-Willem van der Meer 9b678226a7 Merge branch 'feature-multi-ldap-servers-merge-master' into feature-multi-ldap-servers-group-sync ...

Conflicts:
	db/schema.rb
	lib/api/ldap.rb

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

..

fixtures

Use double quotes because we are inserting password now.

2014-10-07 11:48:25 +02:00

migrate

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

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

schema.rb

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

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

seeds.rb

init commit

2011-10-09 00:36:38 +03:00