Merge pull request #2430 from RocketChat/develop

[RELEASE] Merge DEVELOP into BETA
RocketChat · Dec 13, 2018 · ea09018 · ea09018
2 parents d707a43 + 53fbd8d
commit ea09018
Show file tree

Hide file tree

Showing 93 changed files with 2,335 additions and 892 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -69,11 +69,11 @@ PODS:
   - OAuthSwift (1.2.2)
   - RCMarkdownParser (3.0.6)
   - ReachabilitySwift (4.2.1)
-  - Realm (3.11.1):
-    - Realm/Headers (= 3.11.1)
-  - Realm/Headers (3.11.1)
-  - RealmSwift (3.11.1):
-    - Realm (= 3.11.1)
+  - Realm (3.12.0):
+    - Realm/Headers (= 3.12.0)
+  - Realm/Headers (3.12.0)
+  - RealmSwift (3.12.0):
+    - Realm (= 3.12.0)
   - RocketChatViewController (0.1.0):
     - RocketChatViewController/Composer (= 0.1.0)
     - RocketChatViewController/ViewController (= 0.1.0)
@@ -157,7 +157,7 @@ CHECKOUT OPTIONS:
     :commit: c34d9ccef689c55b9eae69f3c65283da8d8b0c6c
     :git: https://github.com/RocketChat/RCMarkdownParser.git
   RocketChatViewController:
-    :commit: 723f1a6857f8d49af11e582dbb7077a99c28cb78
+    :commit: 918d9d91fb856b836795e673b112dc2624f2be06
     :git: https://github.com/RocketChat/RocketChatViewController
   SimpleImageViewer:
     :commit: 8222c338de0f285ca0c2d556c5d8dedd4a365b52
@@ -184,8 +184,8 @@ SPEC CHECKSUMS:
   OAuthSwift: 27b34fe80b76b67cd8f45571e0be2432bc9f6de1
   RCMarkdownParser: 518b616a4f48bb02247243544d4fd55c048288a4
   ReachabilitySwift: 35720ffea59c1c76d15f885be77fd33e33985427
-  Realm: 037c5919b9ceb59d6beed5d3b031096856b119b3
-  RealmSwift: c9580133e73ef40ed340401af2dbc9a5790dfea7
+  Realm: cdaef23c4ddb36ab1ddffed23f5a7f3332fc5585
+  RealmSwift: 5576324033f0aa5ef1e0a839a3da2281dff47a7f
   RocketChatViewController: 00d436e393ac0bd0a62bc72d9a35a9043fc3f3a5
   semver: 11ae3bc4a6036efbc86b5863ef5fa32c065c8bbd
   SimpleImageViewer: 6ed0d2acf7c166a5b4e795bccc7b9ea1b225ff9b

diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/Realm/Realm/ObjectStore/src/object.cpp b/Pods/Realm/Realm/ObjectStore/src/object.cpp
diff --git a/Pods/Realm/Realm/ObjectStore/src/object_store.cpp b/Pods/Realm/Realm/ObjectStore/src/object_store.cpp
diff --git a/Pods/Realm/Realm/ObjectStore/src/results.cpp b/Pods/Realm/Realm/ObjectStore/src/results.cpp
diff --git a/Pods/Realm/Realm/ObjectStore/src/shared_realm.cpp b/Pods/Realm/Realm/ObjectStore/src/shared_realm.cpp