add docompositions folder #77
Open
+11,369
−54
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
epic/statistics_1
fix: minor bugs and incorrect display of UI
fix: minor UI bugs
# Conflicts: # FakeNFT.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
epic/statistics
…rterProject-Public into development # Conflicts: # FakeNFT.xcodeproj/project.pbxproj # FakeNFT.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved # FakeNFT/Scenes /TabBarController/TabBarController.swift .
…rterProject-Public into development # Conflicts: # FakeNFT/Scenes /TabBarController/TabBarController.swift tab bar
…eNFT-StarterProject-Public into development * 'development' of https://github.com/ilyanikitash/iOS-FakeNFT-StarterProject-Public: (48 commits) fix: tabBar and packeges fix: tabBar fix: update kingfisher . fix: review changes feat: like and cart button update feat: empty collection processing feat: collectionView with network, improve ui отступы fix after review 2 fix after review add FavoritesNFT add myNFT add My NFT fix fix: delete empty file feat: view and view controller init FIx after team Review feat: add unit tests New Group For Edit удаление лишних полей ... # Conflicts: # FakeNFT.xcodeproj/project.pbxproj # FakeNFT/Resources/Assets.xcassets/Images/cart.imageset/Contents.json # FakeNFT/Scenes /TabBarController/TabBarController.swift
* epic/cart: Исправления Обновление kingfisher # Conflicts: # FakeNFT.xcodeproj/project.pbxproj
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.