Merge branch 'development' of https://github.com/CosmicMind/Material into development
# Conflicts: # Sources/iOS/TextField.swift
Showing
Pod::Spec.new do |s| | Pod::Spec.new do |s| | ||
s.name = 'Material' | s.name = 'Material' | ||
s.version = '2.6.1' | s.version = '2.6.3' | ||
s.license = 'BSD-3-Clause' | s.license = 'BSD-3-Clause' | ||
s.summary = 'An animation and graphics framework for Material Design in Swift.' | s.summary = 'An animation and graphics framework for Material Design in Swift.' | ||
s.homepage = 'http://materialswift.com' | s.homepage = 'http://materialswift.com' | ||
... | ... |
This diff is collapsed.
Click to expand it.
Sources/iOS/TabMenuController.swift
0 → 100644
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment