Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

X

xnat-web
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

79589da5

Commit 79589da5 authored 8 years ago by Mike McKay

Downloads
- Plain Diff

Merge branch 'master' of https://bitbucket.org/xnatdev/xnat-web

parents fed7963a 417a5fd2

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/nrg/xnat/restlet/services/AliasTokenRestlet.java 9 additions, 6 deletions

...java/org/nrg/xnat/restlet/services/AliasTokenRestlet.java
src/main/java/org/nrg/xnat/security/XnatAuthenticationFilter.java 1 addition, 1 deletion

.../java/org/nrg/xnat/security/XnatAuthenticationFilter.java

with 10 additions and 7 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