Skip to content
Snippets Groups Projects
Commit 9fc5f66b authored by Dariusz Rybicki's avatar Dariusz Rybicki
Browse files

Merge branch 'development' into feature/messenger-receive-file

# Conflicts:
#	Sources/XXMessengerClient/Messenger/Messenger.swift
parents 973cd52f 338c12fa
No related branches found
No related tags found
2 merge requests!123Messenger receive file,!102Release 1.0.0
...@@ -40,6 +40,7 @@ public struct Messenger { ...@@ -40,6 +40,7 @@ public struct Messenger {
public var stopBackup: MessengerStopBackup public var stopBackup: MessengerStopBackup
public var setLogLevel: MessengerSetLogLevel public var setLogLevel: MessengerSetLogLevel
public var startLogging: MessengerStartLogging public var startLogging: MessengerStartLogging
public var sendFile: MessengerSendFile
public var receiveFile: MessengerReceiveFile public var receiveFile: MessengerReceiveFile
} }
...@@ -85,6 +86,7 @@ extension Messenger { ...@@ -85,6 +86,7 @@ extension Messenger {
stopBackup: .live(env), stopBackup: .live(env),
setLogLevel: .live(env), setLogLevel: .live(env),
startLogging: .live(env), startLogging: .live(env),
sendFile: .live(env),
receiveFile: .live(env) receiveFile: .live(env)
) )
} }
...@@ -131,6 +133,7 @@ extension Messenger { ...@@ -131,6 +133,7 @@ extension Messenger {
stopBackup: .unimplemented, stopBackup: .unimplemented,
setLogLevel: .unimplemented, setLogLevel: .unimplemented,
startLogging: .unimplemented, startLogging: .unimplemented,
sendFile: .unimplemented,
receiveFile: .unimplemented receiveFile: .unimplemented
) )
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment