mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-03 10:53:49 +00:00
Merge branch 'master' into test
Conflicts: java/target/configuration/config.ini
This commit is contained in:
commit
34924b0627
668 files changed
+102406
-665
No files matched your search
@@ -5,3 +5,4 @@ eclipse.ignoreApp=true
|
||||
osgi.noShutdown=true
|
||||
org.osgi.service.http.port=8887
|
||||
mongo.port=10201
|
||||
expedition.udp.port=2010
|
||||
Reference in new issue
Block a user