Skip to content

P
PhoneManager
Switch branch/tag
Find file
BlameHistoryPermalink
  • shenyong's avatar
    Merge branch 'Advertisement' of gitlab.huolea.com:ShuMing/phonemanager into Advertisement · 2cf5ae73
    shenyong authored 
    # Conflicts:
#	PhoneManager/Class/Page/Contact/View/Common/AlertView/BaseAlertView.swift
#	PhoneManager/Class/Page/Home/Controller/PhotoSlideViewController.swift
#	PhoneManager/Class/Page/Home/View/AnchorRotatableView.swift
#	PhoneManager/Class/Page/Secret/PMShowImgVideoController.swift
#	PhoneManager/Class/Page/Widget/View/WidgetBornThenView.swift
    2cf5ae73
ContactMergeAlertView.swift 5.36 KB