Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit 42fda31

Browse files
rafaelksrafaelks
authored
Merge pull request #2611 from RocketChat/develop
[CHORE] Merge DEVELOP into BETA
2 parents 50ab3dd + ecad166 commit 42fda31

41 files changed

Lines changed: 422 additions & 351 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ CHECKOUT OPTIONS:
157157
:commit: c34d9ccef689c55b9eae69f3c65283da8d8b0c6c
158158
:git: https://github.com/RocketChat/RCMarkdownParser.git
159159
RocketChatViewController:
160-
:commit: 79d79cb2c779c553ea39a07b4c72af129f4d4dfa
160+
:commit: 93164faa2437e9a24dfbc4bc603cff2268e87a0b
161161
:git: https://github.com/RocketChat/RocketChatViewController
162162
SimpleImageViewer:
163163
:commit: 8222c338de0f285ca0c2d556c5d8dedd4a365b52
@@ -186,7 +186,7 @@ SPEC CHECKSUMS:
186186
ReachabilitySwift: 35720ffea59c1c76d15f885be77fd33e33985427
187187
Realm: cdaef23c4ddb36ab1ddffed23f5a7f3332fc5585
188188
RealmSwift: 5576324033f0aa5ef1e0a839a3da2281dff47a7f
189-
RocketChatViewController: b148da98453900ff5332aec1406ba44573c2ba94
189+
RocketChatViewController: 8c9fa96502913d268bcecf6d15830f1ffd711e7b
190190
semver: 11ae3bc4a6036efbc86b5863ef5fa32c065c8bbd
191191
SimpleImageViewer: 6ed0d2acf7c166a5b4e795bccc7b9ea1b225ff9b
192192
Starscream: 142bd8ef24592d985daee9fa48c936070b85b15f

‎Pods/Local Podspecs/RocketChatViewController.podspec.json‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/Manifest.lock‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/Pods.xcodeproj/project.pbxproj‎

Lines changed: 132 additions & 124 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/RocketChatViewController/Composer/Assets/pl.lproj/Localizable.strings‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/RocketChatViewController/Composer/Classes/ComposerAssets.swift‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/RocketChatViewController/Composer/Classes/Delegate/ComposerViewExpandedDelegate.swift‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/RocketChatViewController/Composer/Classes/Overlays/RecordAudioView.swift‎

Lines changed: 32 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/RocketChatViewController/Composer/Sounds/cancel_audio_record.m4a‎

92 KB
Binary file not shown.

‎Pods/RocketChatViewController/Composer/Sounds/start_audio_record.m4a‎

127 KB
Binary file not shown.

0 commit comments

Comments
 (0)