Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ac
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

1b056b0f

Commit 1b056b0f authored 10 years ago by Dustin Jenkins

Downloads
- Plain Diff

Merge branch 'master' of /srv/cadc/git/wopencadc into s1648

parents 6ce4bdb8 6e303f47

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java 3 additions, 1 deletion

...l-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java 41 additions, 19 deletions

...-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java

with 44 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment