zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity
mastodon-ios/Mastodon/Scene/Settings
History
CMK 5d52fc4578 Merge branch develop into feature/push-notification 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift
#	Mastodon/Scene/Settings/SettingsViewModel.swift
 		2021-04-27 18:16:56 +08:00
..
View feat: make push notification trigger update when change setting 2021-04-26 16:57:50 +08:00
SettingsViewController.swift Merge branch develop into feature/push-notification 2021-04-27 18:16:56 +08:00
SettingsViewModel.swift feat: make push notification trigger update when change setting 2021-04-26 16:57:50 +08:00