Nathan Mattes 58501da5fa Merge branch 'develop' into ios-192-profile-about ... # Conflicts: # Mastodon/Scene/Profile/UserList/FavoritedBy/FavoritedByViewController+DataSourceProvider.swift # Mastodon/Scene/Profile/UserList/RebloggedBy/RebloggedByViewController+DataSourceProvider.swift # Mastodon/Scene/Profile/UserList/UserListViewModel+Diffable.swift # Mastodon/Scene/Profile/UserList/UserListViewModel+State.swift		2024-01-03 17:30:56 +01:00
..
Activity	…
Coordinator	Use relationships in Report-process (IOS-192)	2023-12-31 12:59:39 +01:00
Diffable	Remove user from UserItem-lists (IOS-192)	2023-12-31 12:57:56 +01:00
Extension	Add JSON-based account-persistence (IOS-192)	2023-12-31 12:57:56 +01:00
Generated	…
Helper	…
Preference	…
Protocol	Fix warnings and remove unused code (IOS-192)	2024-01-02 15:37:07 +01:00
Resources	Update strings	2023-11-15 12:52:07 +01:00
Scene	Merge branch 'develop' into ios-192-profile-about	2024-01-03 17:30:56 +01:00
Supporting Files	Configure Profile-button based on relationship and accounts (IOS-192)	2023-12-31 12:57:56 +01:00
Template	…
Vender	…
.sourcery.yml	…
Info.plist	…
Mastodon.entitlements	…
Mastodon.xctestplan	…