Giuseppe Nucifora 1d48a97fdc Merge remote-tracking branch 'origin/master' ...

Conflicts:
	Example/TabBarPicker/TabBarPickerViewController.m
	Pod/Classes/TabBarItem.m
	Pod/Classes/TabBarPicker.m
	Pod/Classes/TabBarPickerSubItemsView.h
	Pod/Classes/TabBarPickerSubItemsView.m
	Pod/Classes/TabBarSubItem.h
	Pod/Classes/TabBarSubItem.m

2015-10-29 01:21:29 +01:00

..

Media.xcassets

Release 1.0.0

2015-10-29 01:04:32 +01:00

Pods

Release 1.0.0

2015-10-29 01:07:28 +01:00

TabBarPicker

Release 1.0.0

2015-10-29 01:04:32 +01:00

TabBarPicker.xcodeproj

Release 1.0.0

2015-10-29 01:04:32 +01:00

TabBarPicker.xcworkspace

Release 0.1.0

2015-07-15 18:26:19 +02:00

Tests

Release 1.0.0

2015-10-29 01:04:32 +01:00

Podfile

no message

2015-08-20 11:56:47 +02:00

Podfile.lock

Release 1.0.0

2015-10-29 01:04:32 +01:00