e6ad839d3c
# Conflicts: # Mastodon.xcodeproj/project.pbxproj |
||
---|---|---|
.. | ||
AccentColor.colorset | ||
AppIcon.appiconset | ||
Arrows | ||
Colors | ||
ToolBar | ||
TootTimeline | ||
Welcome | ||
Contents.json |
e6ad839d3c
# Conflicts: # Mastodon.xcodeproj/project.pbxproj |
||
---|---|---|
.. | ||
AccentColor.colorset | ||
AppIcon.appiconset | ||
Arrows | ||
Colors | ||
ToolBar | ||
TootTimeline | ||
Welcome | ||
Contents.json |