projects/cadcAccessControl-Server/build.xml · 9e647a7930136ed8c8d7665114c3ce806bd8020c · OATS-CADC / ac · GitLab

Snippets Groups Projects

9 years ago
9e647a79
Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · 9e647a79
Jeff Burke authored 9 years ago
```
Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
```
9e647a79

History
Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2
Jeff Burke authored 9 years ago
```
Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
```