Skip to content
Snippets Groups Projects
Commit 3d40daee authored by jbuechele's avatar jbuechele
Browse files

Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.ReactNative into developRC 

# Conflicts:
#	ios/Pods/Manifest.lock
#	ios/Pods/Pods.xcodeproj/project.pbxproj
#	ios/Pods/Target Support Files/Pods-NotificationService/Pods-NotificationService.debug.xcconfig
#	ios/Pods/Target Support Files/Pods-NotificationService/Pods-NotificationService.release.xcconfig
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.markdown
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN-acknowledgements.plist
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.debug.xcconfig
#	ios/Pods/Target Support Files/Pods-RocketChatRN/Pods-RocketChatRN.release.xcconfig
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.markdown
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN-acknowledgements.plist
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.debug.xcconfig
#	ios/Pods/Target Support Files/Pods-ShareRocketChatRN/Pods-ShareRocketChatRN.release.xcconfig
parents 7c4fbc03 e1c8b107
No related branches found
No related tags found
1 merge request!33V2.3.0
Hide whitespace changes
Inline Side-by-side
Showing
with 388 additions and 25 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

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net