Skip to content

Commit 7281f3a

Browse files
michalkonturekmichalkonturek
committed
Merge branch 'develop'
2 parents 2adb13d + b35b5d8 commit 7281f3a

File tree

87 files changed

+3400
-2502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+3400
-2502
lines changed

‎GraphKit/GraphKit.xcodeproj/project.pbxproj

Lines changed: 1535 additions & 608 deletions
Large diffs are not rendered by default.

‎GraphKit/Podfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
source 'https://github.com/CocoaPods/Specs.git'
12

23
pod 'BButton'
34
pod 'FrameAccessor', '~> 1.3.2'

‎GraphKit/Podfile.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
PODS:
2-
- BButton (3.2.3)
2+
- BButton (4.0.1)
33
- FrameAccessor (1.3.2)
4-
- MKFoundationKit/NSArray (1.2.2)
4+
- MKFoundationKit/NSArray (1.2.3)
55

66
DEPENDENCIES:
77
- BButton
88
- FrameAccessor (~> 1.3.2)
99
- MKFoundationKit/NSArray (~> 1.2.2)
1010

1111
SPEC CHECKSUMS:
12-
BButton: b405745cd7ccc9444c696b8690fb79541623766a
13-
FrameAccessor: 1c383c4dc298925749fb2a6b9c05cd45be0d8857
14-
MKFoundationKit: 7f203cb163a892826fa567842c441b1a13b4e70b
12+
BButton: 396a5e59648e3f687b7d8201b88ebdbad6e36b59
13+
FrameAccessor: 5eec95b29b5e9a3afe72a7a2e9ed25b000d3bcc3
14+
MKFoundationKit: 4858fe474ee45f988db5ff1e229d700743e71ed8
1515

16-
COCOAPODS: 0.32.1
16+
COCOAPODS: 0.34.1

‎GraphKit/Pods/BButton/BButton/Classes/BButton.h

Lines changed: 18 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎GraphKit/Pods/BButton/BButton/Classes/BButton.m

Lines changed: 31 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)