Merge remote-tracking branch 'origin/master'

GocePetrovski · Jan 26, 2017 · bff55b3 · bff55b3
2 parents 63fa783 + d761672
commit bff55b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,3 @@
+language: swift
+osx_image: xcode8.2
+xcode_project: ScrollableSegmentedControl.xcodeproj
diff --git a/README.md b/README.md
@@ -1,5 +1,10 @@
 # ScrollableSegmentedControl
 
+[![CI Status](https://travis-ci.org/GocePetrovski/ScrollableSegmentedControl.svg?branch=master)](https://travis-ci.org/GocePetrovski/ScrollableSegmentedControl)
+[![Version](https://img.shields.io/cocoapods/v/ScrollableSegmentedControl.svg?style=flat)](http://cocoadocs.org/docsets/ScrollableSegmentedControl)
+[![License](https://img.shields.io/cocoapods/l/ScrollableSegmentedControl.svg?style=flat)](http://cocoadocs.org/docsets/ScrollableSegmentedControl)
+[![Platform](https://img.shields.io/cocoapods/p/ScrollableSegmentedControl.svg?style=flat)](http://cocoadocs.org/docsets/ScrollableSegmentedControl)
+
 ScrollableSegmentedControl is replacement for UISegmentedControl that becomes scrollable when the total width of all segments exceeds the width of the control itself. 
 
 ScrollableSegmentedControl supports 4 styles of segments: text only, image only, text with image on top and text with image on left. 
@@ -63,4 +68,4 @@ pod 'ScrollableSegmentedControl'
 ```
 
 ### Old-fashioned way
-Just add `ScrollableSegmentedControl.swift` to your project.
+Just add `ScrollableSegmentedControl.swift` to your project.