Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

NomadCommandSystem
- Activity
- Members

Snippets Groups Projects

3d291e14

Commit 3d291e14 authored 5 years ago by Locatelli

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/V4.0' into ploty2

parents 1dccd12d cd7d7801

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 1 addition, 1 deletion

pom.xml
src/main/java/fr/ill/ics/bridge/TokenManager.java 2 additions, 0 deletions

src/main/java/fr/ill/ics/bridge/TokenManager.java
src/main/java/fr/ill/ics/nscclient/notification/DataNotificationClient.java 0 additions, 1 deletion

...ll/ics/nscclient/notification/DataNotificationClient.java
src/main/java/fr/ill/ics/util/ConfigManager.java 21 additions, 1 deletion

src/main/java/fr/ill/ics/util/ConfigManager.java

with 24 additions and 3 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