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

4e1b107a

Commit 4e1b107a authored 8 years ago by Justin Cleveland

Downloads
- Plain Diff

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

parents 89510b5b f76c3115

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

build.gradle 1 addition, 0 deletions

build.gradle
src/main/java/org/nrg/xnat/configuration/DatabaseConfig.java 70 additions, 6 deletions

src/main/java/org/nrg/xnat/configuration/DatabaseConfig.java
src/main/java/org/nrg/xnat/configuration/SpawnerConfig.java 0 additions, 30 deletions

src/main/java/org/nrg/xnat/configuration/SpawnerConfig.java
src/main/java/org/nrg/xnat/configuration/WebConfig.java 5 additions, 2 deletions

src/main/java/org/nrg/xnat/configuration/WebConfig.java

with 76 additions and 38 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