Mike Maxwell 0848f4d077 Merge branch 'features/ActiivtyIndicatorCompatibility' of https://github.com/Panajev/MMMaterialDesignSpinner into Panajev-features/ActiivtyIndicatorCompatibility ...

# Conflicts:
#	Example/MaterialDesignSpinner.xcodeproj/project.pbxproj
#	Pod/Classes/MMMaterialDesignSpinner.h

Also updating Xcode project files due to latest cocoa pods install

2017-07-15 10:07:03 -07:00

..

project.xcworkspace

Initial commit

2014-12-28 10:29:43 -08:00

xcshareddata/xcschemes

Initial commit

2014-12-28 10:29:43 -08:00

project.pbxproj

Merge branch 'features/ActiivtyIndicatorCompatibility' of https://github.com/Panajev/MMMaterialDesignSpinner into Panajev-features/ActiivtyIndicatorCompatibility

2017-07-15 10:07:03 -07:00

project.pbxproj.orig

Merge branch 'features/ActiivtyIndicatorCompatibility' of https://github.com/Panajev/MMMaterialDesignSpinner into Panajev-features/ActiivtyIndicatorCompatibility

2017-07-15 10:07:03 -07:00