Merge branch 'Advertisement' of…
Merge branch 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager into Advertisement * 'Advertisement' of http://gitlab.zhangxindiet.com/ShuMing/phonemanager: 引入新相册资源管理类 垃圾桶数据库 引导页动画 垃圾桶页面 # Conflicts: # PhoneManager/Class/Page/Home/View/DateSelectButtonView.swift # PhoneManager/Class/Page/Home/View/ResourceFilterBoxView.swift # PhoneManager/Class/Page/Home/View/YearMonthPickerView.swift # PhoneManager/Class/Page/Home/View/cell/ResourceFilterBoxTableViewCell.swift
Showing
406 Bytes
529 Bytes
1.06 KB
1.34 KB
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
File moved
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
| # Uncomment the next line to define a global platform for your project | # Uncomment the next line to define a global platform for your project | ||
| platform :ios, '14.0' | platform :ios, '14.0' | ||
| source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git' | #source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git' | ||
| target 'PhoneManager' do | target 'PhoneManager' do | ||
| ... | ... |