Skip to content
Snippets Groups Projects
Commit 42c233be authored by Dominique Blouin's avatar Dominique Blouin
Browse files

Merge branch 'master' into 'merge_pm' 

# Conflicts:
#   src/main/java/ui/TGUIAction.java
#   ttool/src/test/java/launcher/TestRshClient.java
parents f8f1ab51 f8d3dc62
No related branches found
No related tags found
1 merge request!30Merge project manager into master
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment