Skip to content

Commit

Permalink
Merge pull request leancloud#233 from ChenYilong/master
Browse files Browse the repository at this point in the history
prepare to merge RedpacketLib PR
  • Loading branch information
ChenYilong authored Dec 26, 2016
2 parents 3683fe6 + 32708d4 commit a2d54ef
Show file tree
Hide file tree
Showing 7 changed files with 315 additions and 188 deletions.
2 changes: 1 addition & 1 deletion ChatKit-OC/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pod 'TWMessageBarManager'
pod 'MLPAutoCompleteTextField'
#pod 'MLeaksFinder'
pod 'FTPopOverMenu'
pod "RedpacketLib" ,"~> 3.4.0"
pod "RedpacketLib" ,"~> 3.3.2"
pod "FXForms", "~> 1.2.14"

end
8 changes: 4 additions & 4 deletions ChatKit-OC/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ PODS:
- SDWebImage (!= 3.7.2, ~> 3.7)
- pop (1.0.9)
- RedPacketAlipay (15.0.2)
- RedpacketLib (3.4.0):
- RedpacketLib (3.3.3):
- RedPacketAlipay
- SDWebImage (3.8.2):
- SDWebImage/Core (= 3.8.2)
Expand All @@ -59,7 +59,7 @@ DEPENDENCIES:
- FTPopOverMenu
- FXForms (~> 1.2.14)
- MLPAutoCompleteTextField
- RedpacketLib
- RedpacketLib (~> 3.3.2)
- TWMessageBarManager

EXTERNAL SOURCES:
Expand All @@ -86,11 +86,11 @@ SPEC CHECKSUMS:
MWPhotoBrowser: 5836d7aa041dc05a13de380c246826578adc5ea5
pop: f667631a5108a2e60d9e8797c9b32ddaf2080bce
RedPacketAlipay: a5de6db2e2671fc9255d6d396be869e3ba2f0489
RedpacketLib: ac4c0e8892bf4559dd55b32d7256e216724dd4a8
RedpacketLib: 83ab1c466d0ca1373046d80599f749a4e3f188a6
SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
TWMessageBarManager: fd84e7948ba7968a2b5d9454859135761214ec56
UITableView+FDTemplateLayoutCell: 02b508ab1cb4cea16a8c17ac83d2cd1fd72124f9

PODFILE CHECKSUM: d1efe8d2d1ca285e64cc555a56dc43f9d9c39cdf
PODFILE CHECKSUM: af6f2ede34773f2edad96f4728dd76f5a8d4e50a

COCOAPODS: 1.1.1
8 changes: 4 additions & 4 deletions ChatKit-OC/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 a2d54ef

Please sign in to comment.