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

..

Local Podspecs

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

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

Pods.xcodeproj

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

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

Target Support Files

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

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

Manifest.lock

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

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