Skip to content
Snippets Groups Projects
Commit 0bc7947b authored by Jeff Burke's avatar Jeff Burke
Browse files

Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 

Conflicts:
	projects/cadcAccessControl-Server/test/LdapConfig.test.properties
	projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
parents 8363572b 6b2786a8
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 721 additions and 275 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment