Merge branch 'develop' into master

ReseauEntourage · Aug 12, 2020 · 68ed605 · 68ed605
2 parents 397429f + f647d8f
commit 68ed605
Show file tree

Hide file tree

Showing 414 changed files with 28,562 additions and 12,645 deletions.
diff --git a/Podfile b/Podfile
@@ -6,7 +6,7 @@ platform :ios, '9.0'
 
 def sharedPods
     platform :ios, '9.0'
-        
+
     pod 'AFNetworking'
     pod 'SWRevealViewController', '2.3.0'
     pod 'MBProgressHUD', '0.8'
@@ -28,6 +28,7 @@ def sharedPods
     pod 'GooglePlaces'
     pod 'GoogleMaps'
     pod 'SDWebImage'
+    pod 'TTTAttributedLabel'
 end
 
 target "entourage" do

diff --git a/Podfile.lock b/Podfile.lock
@@ -144,6 +144,7 @@ PODS:
   - SnapKit (4.0.1)
   - SVProgressHUD (2.2.5)
   - SWRevealViewController (2.3.0)
+  - TTTAttributedLabel (2.0.0)
 
 DEPENDENCIES:
   - AFNetworking
@@ -167,6 +168,7 @@ DEPENDENCIES:
   - SnapKit (~> 4.0.0)
   - SVProgressHUD
   - SWRevealViewController (= 2.3.0)
+  - TTTAttributedLabel
 
 SPEC REPOS:
   https://github.com/CocoaPods/Specs.git:
@@ -207,6 +209,7 @@ SPEC REPOS:
     - SnapKit
     - SVProgressHUD
     - SWRevealViewController
+    - TTTAttributedLabel
 
 SPEC CHECKSUMS:
   AFNetworking: d9fdf484a3c723ec3c558a41cc5754c7e845ee77
@@ -246,7 +249,8 @@ SPEC CHECKSUMS:
   SnapKit: 0de968a9fec17499afa29683b05d0c775b6d1c29
   SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
   SWRevealViewController: 6d3fd97f70112fd7cef9de14df4260eacce4c63a
+  TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656
 
-PODFILE CHECKSUM: d5c6003c8b91c54a08c14a09a57af276d5e498f5
+PODFILE CHECKSUM: 1cd6cf74ec2e379ab6a76d060bfe087f29adcc08
 
-COCOAPODS: 1.8.4
+COCOAPODS: 1.9.3
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/Pods.xcodeproj/xcshareddata/xcschemes/Crashlytics.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Crashlytics.xcscheme
diff --git a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/FBSDKCoreKit.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/FBSDKCoreKit.xcscheme
diff --git a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Fabric.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Fabric.xcscheme
diff --git a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Firebase.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Firebase.xcscheme