-
Merge branch 'master' of https://github.com/CosmicMind/Material · 2709465c# Conflicts: # Sources/Assets.xcassets/cm_add_white.imageset/Contents.json # Sources/Assets.xcassets/cm_audio_white.imageset/cm_audio_white.png # Sources/Assets.xcassets/cm_audio_white.imageset/cm_audio_white_2x.png # Sources/Assets.xcassets/cm_audio_white.imageset/cm_audio_white_3x.png # Sources/Assets.xcassets/cm_pen_white.imageset/cm_pen_white.png # Sources/Assets.xcassets/cm_pen_white.imageset/cm_pen_white_2x.png # Sources/Assets.xcassets/cm_pen_white.imageset/cm_pen_white_3x.png # Sources/Assets.xcassets/cm_share_white.imageset/Contents.json # Sources/Assets.xcassets/cm_star_white.imageset/Contents.json # Sources/Assets.xcassets/cm_video_white.imageset/cm_video_white.png # Sources/Assets.xcassets/cm_video_white.imageset/cm_video_white_2x.png # Sources/Assets.xcassets/cm_video_white.imageset/cm_video_white_3x.png # Sources/Assets.xcassets/ic_photo_camera_white.imageset/Contents.json # Sources/Assets.xcassets/ic_photo_library_white.imageset/Contents.json # Sources/Assets.xcassets/ic_settings_white.imageset/Contents.json # Sources/iOS/MaterialIcon.swift
Ramon Vicente committed
| Name |
Last commit
|
Last Update |
|---|---|---|
| .. | ||
| Contents.json | Loading commit data... | |
| cm_settings_white.png | Loading commit data... | |
| cm_settings_white_2x.png | Loading commit data... | |
| cm_settings_white_3x.png | Loading commit data... |
