Skip to content
Commit 844f2c43 authored by Jeff Burke's avatar Jeff Burke
Browse files

Merge branch 's1666' of ssh://mach16/srv/cadc/git/wopencadc into s1666 

Conflicts:
	projects/cadcAccessControl-Server/build.xml
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GetGroupNamesAction.java
parents d8046963 ea1914e5
Hide whitespace changes
Inline Side-by-side
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