Skip to content

Commit

Permalink
Merge branch 'develop' into feature/im_3
Browse files Browse the repository at this point in the history
# Conflicts:
#	dydx/dydxPresenters/dydxPresenters.xcodeproj/project.pbxproj
#	dydx/dydxPresenters/dydxPresenters/_v4/Trade/Margin/dydxTargetLeverageViewBuilder.swift
#	dydx/dydxViews/dydxViews.xcodeproj/project.pbxproj
#	dydx/dydxViews/dydxViews/_v4/Trade/Margin/dydxTargetLeverageView.swift
  • Loading branch information
ruixhuang committed May 9, 2024
2 parents ef8ef2c + 0dde63c commit a7e196a
Show file tree
Hide file tree
Showing 19 changed files with 7,869 additions and 7,812 deletions.
12 changes: 6 additions & 6 deletions dydx/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- Abacus (1.6.55)
- Abacus (1.7.4)
- Amplitude-iOS (4.10.0)
- AppsFlyerFramework (6.14.3):
- AppsFlyerFramework/Main (= 6.14.3)
Expand Down Expand Up @@ -258,9 +258,9 @@ PODS:
- PromisesObjC (= 2.4.0)
- RDHCollectionViewGridLayout (1.2.5)
- ReachabilitySwift (5.2.2)
- SDWebImage (5.19.1):
- SDWebImage/Core (= 5.19.1)
- SDWebImage/Core (5.19.1)
- SDWebImage (5.19.2):
- SDWebImage/Core (= 5.19.2)
- SDWebImage/Core (5.19.2)
- SDWebImageSVGCoder (1.7.0):
- SDWebImage/Core (~> 5.6)
- SDWebImageSwiftUI (3.0.4):
Expand Down Expand Up @@ -386,7 +386,7 @@ CHECKOUT OPTIONS:
:git: https://github.com/dydxprotocol/Charts.git

SPEC CHECKSUMS:
Abacus: f41c83084932f3c7a62fdd87d24e2d8a1712eadb
Abacus: a2bb467d0e976fb3d5ef814c308bb0159a9bd458
Amplitude-iOS: 7d8cdc3408ba35c2e68368fc7c692cd104606b94
AppsFlyerFramework: 0a68f5b72bbbadfa71d4ae3eaf040e82d62e8518
Atributika: ecedf5259e4aa3c6278d840b6c18d60c1a8b6ca0
Expand Down Expand Up @@ -434,7 +434,7 @@ SPEC CHECKSUMS:
PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
RDHCollectionViewGridLayout: 4b4229212ed8c136aa70101d92ecd43742ca62b6
ReachabilitySwift: 2128f3a8c9107e1ad33574c6e58e8285d460b149
SDWebImage: 40b0b4053e36c660a764958bff99eed16610acbb
SDWebImage: dfe95b2466a9823cf9f0c6d01217c06550d7b29a
SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
SDWebImageSwiftUI: 824628d8220906aa101f62b39a7492edd138449d
SimpleKeychain: 8193a9e40967eccac933c1fde82de46c07a5ae26
Expand Down
6 changes: 3 additions & 3 deletions dydx/Pods/Local Podspecs/abacus.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions dydx/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit a7e196a

Please sign in to comment.