Andrzej Michnia 3c1955c719 Merge remote-tracking branch 'github/master' into release/2.1.0 ...

# Conflicts:
#	CHANGELOG.md
#	Example/HGCircularSlider.xcodeproj/project.pbxproj
#	HGCircularSlider.podspec
#	HGCircularSlider/Classes/CircularSliderHelper.swift

2017-04-13 14:18:44 +02:00

..

HGCircularSlider

Restored example project. Updated swift syntax.

2017-04-13 12:07:53 +02:00

HGCircularSlider.xcodeproj

Merge remote-tracking branch 'github/master' into release/2.1.0

2017-04-13 14:18:44 +02:00

HGCircularSlider.xcworkspace

Restored example project. Updated swift syntax.

2017-04-13 12:07:53 +02:00

Tests

Restored example project. Updated swift syntax.

2017-04-13 12:07:53 +02:00

Podfile

Restored example project. Updated swift syntax.

2017-04-13 12:07:53 +02:00

Podfile.lock

Merge remote-tracking branch 'github/master' into release/2.1.0

2017-04-13 14:18:44 +02:00