Mastodon
/
mastodon-app-ufficiale-iphone-ios
mirror of https://github.com/mastodon/mastodon-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,484 Commits 34 Branches 356 Tags 66 MiB
Commit Graph

425 Commits

Author SHA1 Message Date
Eugen Rochko 590bc22918 New translations ios-infoPlist.json (Catalan) 2021-08-05 18:17:18 +02:00
Eugen Rochko 37b0c94ad5 New translations app.json (Catalan) 2021-08-05 18:17:17 +02:00
Eugen Rochko 595b088cc6 New translations ios-infoPlist.json (Arabic) 2021-08-05 16:59:48 +02:00
Eugen Rochko bb87947577 New translations app.json (Catalan) 2021-08-05 16:59:47 +02:00
Eugen Rochko 43a77ceb2d New translations app.json (Arabic) 2021-08-05 16:59:46 +02:00
Eugen Rochko 3fae11ad4b New translations app.json (Catalan) 2021-08-05 15:52:19 +02:00
Eugen Rochko c58dbb8b7c New translations Localizable.stringsdict (Catalan) 2021-08-05 14:38:36 +02:00
Eugen Rochko 843452d871 New translations Intents.strings (Catalan) 2021-08-05 14:38:35 +02:00
Eugen Rochko 2c80fb2834 New translations Localizable.stringsdict (Spanish) 2021-08-05 14:38:33 +02:00
Eugen Rochko e5a869c542 New translations Intents.strings (Spanish) 2021-08-05 14:38:32 +02:00
Eugen Rochko d5f336716c New translations ios-infoPlist.json (Catalan) 2021-08-05 14:38:31 +02:00
Eugen Rochko 7d65366853 New translations ios-infoPlist.json (Spanish) 2021-08-05 14:38:30 +02:00
Eugen Rochko da3529d996 New translations app.json (Catalan) 2021-08-05 14:38:30 +02:00
Eugen Rochko a58dc43706 New translations app.json (Spanish) 2021-08-05 14:38:29 +02:00
Eugen Rochko 5c2f57e1e7 New translations app.json (Spanish) 2021-08-05 13:42:24 +02:00
Eugen Rochko 33c25c980e New translations app.json (Spanish) 2021-08-05 12:46:00 +02:00
Eugen Rochko ea958c4bcc New translations app.json (German) 2021-08-05 11:50:09 +02:00
Eugen Rochko dd0412a0e3 New translations app.json (Arabic) 2021-08-05 11:50:08 +02:00
Eugen Rochko e1e34a5e26 New translations app.json (German) 2021-08-05 10:51:49 +02:00
Eugen Rochko 2d985b5ff7 New translations app.json (Arabic) 2021-08-05 10:51:48 +02:00
Eugen Rochko 2628b1fe12 New translations Localizable.stringsdict (Korean) 2021-08-05 09:27:20 +02:00
Eugen Rochko 9576fd38e1 New translations Localizable.stringsdict (Chinese Simplified) 2021-08-05 09:27:19 +02:00
Eugen Rochko 0e48e8b827 New translations app.json (Korean) 2021-08-05 09:27:18 +02:00
Eugen Rochko af40308c1a New translations app.json (Spanish) 2021-08-05 09:27:17 +02:00
Eugen Rochko 046b3deab7 New translations app.json (French) 2021-08-05 09:27:16 +02:00
Eugen Rochko ab0eb2c3e1 New translations Localizable.stringsdict (Chinese Simplified) 2021-08-05 08:23:12 +02:00
Eugen Rochko f9ecba01c3 New translations app.json (Russian) 2021-08-05 06:51:31 +02:00
Eugen Rochko 7736ecbe94 New translations app.json (Korean) 2021-08-05 05:55:22 +02:00
Eugen Rochko 208523cd51 New translations Intents.strings (Korean) 2021-08-05 04:51:45 +02:00
Eugen Rochko b79bdbe596 New translations ios-infoPlist.json (Korean) 2021-08-05 04:51:44 +02:00
Eugen Rochko 7bcf3ed455 New translations app.json (Korean) 2021-08-05 04:51:43 +02:00
Eugen Rochko 639a9bf121 New translations Localizable.stringsdict (Korean) 2021-08-05 03:35:59 +02:00
Eugen Rochko 07620206f9 New translations Intents.strings (Korean) 2021-08-05 03:35:58 +02:00
Eugen Rochko 43076ac5c1 New translations ios-infoPlist.json (Korean) 2021-08-05 03:35:57 +02:00
Eugen Rochko b2d9b7930b New translations app.json (Korean) 2021-08-05 03:35:56 +02:00
Eugen Rochko 6a17c8571d New translations app.json (German) 2021-08-05 03:35:56 +02:00
Eugen Rochko 226aab7788 New translations Localizable.stringsdict (German) 2021-08-05 02:37:56 +02:00
Eugen Rochko c44c43fdd3 New translations ios-infoPlist.json (German) 2021-08-05 02:37:55 +02:00
Eugen Rochko 48abd4376a New translations app.json (German) 2021-08-05 02:37:54 +02:00
Eugen Rochko 10da35ae20 New translations Localizable.stringsdict (French) 2021-08-04 22:13:06 +02:00
Eugen Rochko 8511588c08 New translations Intents.strings (French) 2021-08-04 22:13:06 +02:00
Eugen Rochko 56c2cbdcec New translations ios-infoPlist.json (French) 2021-08-04 22:13:04 +02:00
Eugen Rochko 4e23f48417 New translations app.json (French) 2021-08-04 22:13:03 +02:00
Eugen Rochko d42dd4a782 New translations app.json (French) 2021-08-04 21:06:59 +02:00
Eugen Rochko bfa80eb5ed New translations app.json (French) 2021-08-04 19:55:57 +02:00
Eugen Rochko 04ab8da2e0 New translations app.json (French) 2021-08-04 18:35:36 +02:00
Eugen Rochko e8c53e1b5b New translations Intents.strings (Spanish) 2021-08-04 16:11:51 +02:00
Eugen Rochko c437a68186 New translations app.json (Russian) 2021-08-04 16:11:50 +02:00
Eugen Rochko cdbfbd7e71 New translations Localizable.stringsdict (Spanish) 2021-08-04 15:00:11 +02:00
Eugen Rochko a56b34d639 New translations Intents.strings (Spanish) 2021-08-04 15:00:10 +02:00
Eugen Rochko 99cff6b41c New translations ios-infoPlist.json (Spanish) 2021-08-04 15:00:09 +02:00
Eugen Rochko de08ad43d9 New translations app.json (Spanish) 2021-08-04 15:00:08 +02:00
Eugen Rochko a90000b827 New translations Localizable.stringsdict (Welsh) 2021-08-04 14:04:53 +02:00
Eugen Rochko b176c386d6 New translations Localizable.stringsdict (Hindi) 2021-08-04 14:04:52 +02:00
Eugen Rochko 003062aa12 New translations Localizable.stringsdict (Spanish, Argentina) 2021-08-04 14:04:51 +02:00
Eugen Rochko a144314a6a New translations Localizable.stringsdict (Portuguese, Brazilian) 2021-08-04 14:04:50 +02:00
Eugen Rochko c67a3e1217 New translations Localizable.stringsdict (Chinese Simplified) 2021-08-04 14:04:49 +02:00
Eugen Rochko 20cad1055f New translations Localizable.stringsdict (Russian) 2021-08-04 14:04:48 +02:00
Eugen Rochko 6d573719d2 New translations Localizable.stringsdict (Portuguese) 2021-08-04 14:04:47 +02:00
Eugen Rochko 5d45659a51 New translations Localizable.stringsdict (Japanese) 2021-08-04 14:04:46 +02:00
Eugen Rochko 0e2a5121cd New translations Localizable.stringsdict (German) 2021-08-04 14:04:46 +02:00
Eugen Rochko 66cd01ff8e New translations Localizable.stringsdict (Arabic) 2021-08-04 14:04:45 +02:00
Eugen Rochko fbacfed349 New translations Localizable.stringsdict (Spanish) 2021-08-04 14:04:44 +02:00
Eugen Rochko 4f466684c1 New translations Localizable.stringsdict (French) 2021-08-04 14:04:43 +02:00
Eugen Rochko 2f938831ac New translations app.json (Russian) 2021-08-04 13:03:04 +02:00
CMK b41b7403f3 chore: add stringsdict for i18n 2021-08-04 19:01:02 +08:00
Eugen Rochko 87a8e6643a New translations app.json (Russian) 2021-08-04 12:07:45 +02:00
Eugen Rochko 53a39e2d37 New translations app.json (German) 2021-08-03 23:32:19 +02:00
Eugen Rochko c854306420 New translations app.json (German) 2021-08-03 22:32:21 +02:00
CMK 945213b5a8 chore: update scripts 2021-08-03 19:22:23 +08:00
CMK e75bcaa7f1 Merge branch 'l10n_develop' into support-japanese 2021-08-03 19:14:33 +08:00
Eugen Rochko a14c56965d New translations Intents.strings (Arabic) 2021-08-03 13:13:25 +02:00
Eugen Rochko 224a43ec6d New translations ios-infoPlist.json (Arabic) 2021-08-03 13:13:21 +02:00
Eugen Rochko 93d852c032 New translations app.json (Japanese) 2021-08-03 13:13:17 +02:00
Eugen Rochko dff8858fd6 New translations app.json (Arabic) 2021-08-03 13:13:15 +02:00
Eugen Rochko 5cb765f432 New translations app.json (Japanese) 2021-08-03 12:50:08 +02:00
Eugen Rochko bdc976813d New translations Intents.strings (Chinese Simplified) 2021-08-03 11:15:14 +02:00
Eugen Rochko 167902674e New translations ios-infoPlist.json (Chinese Simplified) 2021-08-03 11:15:13 +02:00
Eugen Rochko f3bb5a7d22 New translations app.json (Chinese Simplified) 2021-08-03 11:15:12 +02:00
Eugen Rochko 64fda24c8f New translations app.json (Chinese Simplified) 2021-08-03 09:53:03 +02:00
Eugen Rochko 506575c652 New translations app.json (Chinese Simplified) 2021-08-03 08:13:51 +02:00
Eugen Rochko 5fa9231055 New translations app.json (Spanish, Argentina) 2021-08-03 06:58:54 +02:00
Eugen Rochko 48f467fbb1 New translations app.json (Chinese Simplified) 2021-08-03 05:02:45 +02:00
Eugen Rochko f0e7ec676f New translations Intents.strings (Welsh) 2021-08-03 00:34:26 +02:00
Eugen Rochko 979f15656a New translations app.json (German) 2021-08-03 00:34:25 +02:00
Eugen Rochko def4008c8e New translations app.json (Portuguese) 2021-08-03 00:34:24 +02:00
Eugen Rochko 89858e8b8c New translations app.json (Russian) 2021-08-03 00:34:24 +02:00
Eugen Rochko 66aebeb954 New translations app.json (Portuguese, Brazilian) 2021-08-03 00:34:23 +02:00
Eugen Rochko e4272d520f New translations ios-infoPlist.json (French) 2021-08-03 00:34:22 +02:00
Eugen Rochko 1ac4269d77 New translations ios-infoPlist.json (Spanish) 2021-08-03 00:34:21 +02:00
Eugen Rochko 16a1382b16 New translations ios-infoPlist.json (German) 2021-08-03 00:34:20 +02:00
Eugen Rochko e6714beecc New translations ios-infoPlist.json (Portuguese) 2021-08-03 00:34:20 +02:00
Eugen Rochko a71914e723 New translations ios-infoPlist.json (Russian) 2021-08-03 00:34:19 +02:00
Eugen Rochko acefc49835 New translations ios-infoPlist.json (Portuguese, Brazilian) 2021-08-03 00:34:18 +02:00
Eugen Rochko 5211289f61 New translations app.json (Spanish) 2021-08-03 00:34:17 +02:00
Eugen Rochko 87840d264b New translations Intents.strings (French) 2021-08-03 00:34:16 +02:00
Eugen Rochko fecbc00afd New translations Intents.strings (German) 2021-08-03 00:34:15 +02:00
Eugen Rochko 47fbb7979c New translations Intents.strings (Portuguese) 2021-08-03 00:34:13 +02:00
Eugen Rochko b7a033cfc6 New translations Intents.strings (Russian) 2021-08-03 00:34:12 +02:00
Eugen Rochko 02aba9da09 New translations Intents.strings (Portuguese, Brazilian) 2021-08-03 00:34:11 +02:00
Eugen Rochko de653b5927 New translations app.json (Hindi) 2021-08-03 00:34:11 +02:00
Eugen Rochko 2b44d29bbc New translations ios-infoPlist.json (Hindi) 2021-08-03 00:34:10 +02:00
Eugen Rochko f05f8367df New translations Intents.strings (Hindi) 2021-08-03 00:34:09 +02:00
Eugen Rochko 849b17d837 New translations app.json (Welsh) 2021-08-03 00:34:08 +02:00
Eugen Rochko faa6c0da01 New translations ios-infoPlist.json (Welsh) 2021-08-03 00:34:07 +02:00
Eugen Rochko d9cb30a637 New translations Intents.strings (Spanish) 2021-08-03 00:34:06 +02:00
Eugen Rochko c4ccaba784 New translations app.json (French) 2021-08-03 00:34:05 +02:00
Eugen Rochko 1d244c19e6 New translations Intents.strings (Spanish, Argentina) 2021-08-02 14:52:45 +02:00
Eugen Rochko 30671ee3ef New translations Intents.strings (Chinese Simplified) 2021-08-02 14:52:44 +02:00
Eugen Rochko 80204001b0 New translations Intents.strings (Japanese) 2021-08-02 14:52:43 +02:00
Eugen Rochko 8f3bd44404 New translations ios-infoPlist.json (Spanish, Argentina) 2021-08-02 14:52:42 +02:00
Eugen Rochko 32d81cec65 New translations app.json (Spanish, Argentina) 2021-08-02 14:52:42 +02:00
Eugen Rochko 5e65cd8f72 New translations app.json (Spanish, Argentina) 2021-08-02 13:46:46 +02:00
Eugen Rochko 5ffab1ad15 New translations ios-infoPlist.json (Spanish, Argentina) 2021-08-02 13:29:35 +02:00
Eugen Rochko 1759c7ec59 New translations app.json (Spanish, Argentina) 2021-08-02 13:29:33 +02:00
Eugen Rochko b1b5dba1a8 New translations ios-infoPlist.json (Chinese Simplified) 2021-08-02 13:29:32 +02:00
Eugen Rochko 59db310f65 New translations ios-infoPlist.json (Japanese) 2021-08-02 13:29:31 +02:00
Eugen Rochko 067e649d51 New translations app.json (Chinese Simplified) 2021-08-02 13:29:30 +02:00
Eugen Rochko 9c2c996e16 New translations app.json (Japanese) 2021-08-02 13:29:29 +02:00
CMK bccdb66023 chore: update README 2021-08-02 19:26:39 +08:00
Eugen Rochko 4264daaed9 New translations ios-infoPlist.json (Japanese) 2021-08-02 11:06:10 +02:00
Eugen Rochko 8d3889a55a New translations app.json (Japanese) 2021-08-02 11:06:09 +02:00
CMK 5add231379 chore: update i18n and version to 1.0.0 (49) 2021-07-28 11:05:28 +08:00
CMK b07a6f8ba9 feat: add compose and search home screen quick actions 2021-07-26 17:41:00 +08:00
CMK fff4f0a204 feat: add emoji animation preference 2021-07-23 19:33:05 +08:00
CMK 7b8500e120 feat: set theme color for share action extension 2021-07-20 19:24:24 +08:00
CMK d2f9828f50 feat: complete upload and publish logic 2021-07-20 16:40:04 +08:00
CMK a84f213b20 chore: update i18n string 2021-07-15 21:04:31 +08:00
CMK 0ede1bfee8 Merge branch 'fix-strings' into fix/search 
# Conflicts:
#	Mastodon/Resources/en.lproj/Localizable.strings
 2021-07-15 21:01:47 +08:00
CMK acc24b7ef5 feat: add not result hint for search. fix: user timeline loader spinner not stop issue 2021-07-15 17:26:04 +08:00
CMK 8d4752d71f feat: [WIP] add search result list for scopes searching 2021-07-14 20:28:41 +08:00
CMK f265e988e7 feat: add account settings entry in settings scene 2021-07-13 17:39:38 +08:00
CMK 0dacea6326 feat: add filter for status 2021-07-09 19:07:12 +08:00
CMK 5fa78394a3 feat: add "Using default browser open link" preference option. ticket: #20625EEA 2021-07-08 15:58:11 +08:00
CMK e192bf40e2 fix: i18n string not follow design issue. ticket: #18624SLP 2021-07-07 20:16:37 +08:00
CMK 13a1194a59 feat: add "Disable avatar animation" preference 2021-07-07 14:55:41 +08:00
CMK 66de0593df feat: add copy photo action for status 2021-07-06 19:53:47 +08:00
CMK 1214180c55 fix: hard code instance version tag issue. resolve #203 2021-07-06 15:20:32 +08:00
CMK 0ef3c0f7c8 fix: i18n string plural issue 2021-07-06 14:55:24 +08:00
CMK d03d39a14d feat: add theme 2021-07-05 20:21:11 +08:00
CMK 747becda79 fix: profile fields edit using wrong material issue 2021-06-24 19:20:41 +08:00
CMK 36fdef15df fix: wrong i18n string symbol issue 2021-06-24 16:49:34 +08:00
CMK 4af2c0ca78 fix: profile block state i18n strings not set with name issue. resolve #171 2021-06-24 14:32:01 +08:00
CMK 51c29fa564 fix: toggle content overlay not works for reblog issue. Update content overlay UI 2021-06-23 20:47:49 +08:00
CMK 5ae2474b30 fix: typo 2021-06-22 20:54:34 +08:00
CMK 4bee550f83 fix: "Edit info" wrong i18n string issue in profile scene 2021-06-22 19:37:34 +08:00
CMK a23fc3cab8 fix: "clear" button wrong i18n string issue in searching scene 2021-06-22 17:47:21 +08:00
CMK f826cacccf fix: add interact hint label and separator line for emoji auto complete in compose scene 2021-06-21 18:30:24 +08:00
CMK 2c2aa127bf fix: wrong apostrophe for i18n issue 2021-06-21 17:52:38 +08:00
CMK cd31d79357 fix: add missing "ago" for timestamp 2021-06-17 14:19:43 +08:00
CMK 8b94102289 feat: update status timestamp behavior. resolve #82 2021-06-01 14:31:31 +08:00
CMK 70b75c8eba feat: display clean cache result 2021-06-01 14:07:44 +08:00
CMK a9744146ce feat: add video attachment post supports 2021-05-31 16:42:49 +08:00
CMK b15974dcfb feat: add profile field and update ActiveLabel entity supports 2021-05-27 13:56:55 +08:00
CMK 0bcfc14aa6 feat: add keyboard shortcuts for compose scene 2021-05-21 19:12:01 +08:00
CMK 443c863465 feat: add segment control shortcut for profile scene 2021-05-21 17:42:14 +08:00
CMK 611d65dd30 feat: add segmented control keyboard shortcut for notification scene 2021-05-21 17:18:03 +08:00
CMK aec7a1f5ea feat: add navigation shortcut for notification scene 2021-05-21 16:52:47 +08:00
CMK c44ced7501 feat: add keyboard navigate for timeline 2021-05-21 15:23:02 +08:00
CMK 5c6618f13e feat: add keyboard shortcuts for settings and favorites 2021-05-19 16:45:01 +08:00
CMK 5cbfa28b93 feat: add keyboard shortcuts for tabs 2021-05-19 15:15:19 +08:00
CMK 3927f1630a feat: implement auto complete for emoji/hashtag/mention 2021-05-18 14:25:32 +08:00
CMK 46baa59d37 feat: add picker server loader. Set chevron image for expand button 2021-05-13 17:50:37 +08:00
CMK d8ce63df80 chore: update i18n. resolve #94 2021-05-13 16:06:28 +08:00
CMK 78eaf226a4 chore: add ar language code supports 2021-05-13 14:46:40 +08:00
CMK ec2be58952 feat: add accessibility supports for compose scene 2021-05-13 14:27:57 +08:00
CMK 6ba6598b96 feat: add accessibility supports for timeline 2021-05-12 18:26:53 +08:00
CMK 36273467c1 Merge branch 'develop' into release/0.4.0 
# Conflicts:
#	Mastodon/Scene/Share/View/Content/StatusView.swift
 2021-05-10 18:54:08 +08:00
sunxiaojian 505c251b37 fix: move message to title 2021-05-10 15:40:46 +08:00
sunxiaojian d3256f3171 fix: delete reblogFrom inNotifications poll pollOption when delete status 2021-05-07 20:36:31 +08:00
CMK b63ae6800b feat: add a11y for server category picker 2021-05-07 20:02:28 +08:00
sunxiaojian 5278002c15 feat: Add post delete action entry for user posts 2021-05-07 16:08:07 +08:00
sunxiaojian b8f3f4c886 fix: remove ActionToolbarContainer.moreButtonDidPressed 2021-05-06 18:19:24 +08:00
sunxiaojian 5f921c1537 Merge branch 'develop' into feature/statusMenu 2021-05-06 16:31:34 +08:00
CMK 51c01066d3 feat: add photo library permission checking 2021-05-06 15:05:24 +08:00
sunxiaojian 514e5b0443 chore: remove useless change 2021-04-30 15:38:15 +08:00
sunxiaojian 0403cc0109 Merge branch 'develop' into feature/statusMenu 2021-04-30 12:57:43 +08:00
sunxiaojian 33401b4e1f feature: finish domainBlock action and domainUnblick action 2021-04-30 12:53:25 +08:00
sunxiaojian ccdc48add1 feature: blockDomain 2021-04-29 17:01:36 +08:00
sunxiaojian 211e2f25d5 chore: add share post 2021-04-29 11:03:21 +08:00
sxiaojian88 ee5e2bde1f
Merge branch 'develop' into feature/followrequest 2021-04-27 19:43:47 +08:00
Hugo 2e8183adc6
Merge pull request #111 from tootsuite/feature/report 
Feature/report
 2021-04-27 17:53:20 +08:00
sunxiaojian 42f63808df feature: add follow request notification 2021-04-27 14:27:27 +08:00
sunxiaojian dcb1bb7053 fix: change delete to Delete, set deleteAction attributes: [.destructive] 2021-04-26 20:36:59 +08:00
ihugo 36a6b8b8cc Merge branch 'develop' into feature/report 
# Conflicts:
#	Localization/app.json
 2021-04-26 17:53:38 +08:00
ihugo ad8df6813f fix: add entries for the reporting 2021-04-26 16:34:05 +08:00
sxiaojian88 bcdb55f9f0
Merge pull request #110 from tootsuite/feature/suggestion 
Feature/suggestion
 2021-04-23 04:49:06 -07:00
ihugo 3810588abb chor: restyle localized string 2021-04-22 22:58:21 +08:00
ihugo 23d9853a71 Merge branch 'develop' into feature/report 
# Conflicts:
#	CoreDataStack/Entity/Status.swift
 2021-04-22 12:54:16 +08:00
ihugo e3df692c3f feat: report 2021-04-22 12:52:11 +08:00
sunxiaojian c8474c6a7f feature: suggestion account scene 2021-04-21 16:17:42 +08:00
sunxiaojian e7cd130bf1 fix: L18n repair 2021-04-20 16:46:04 +08:00
CMK f8127428dd Merge branch 'develop' into feature/content-warning 
# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
 2021-04-19 19:32:16 +08:00
sunxiaojian bd9860b792 Merge branch 'develop' into feature/notification 2021-04-19 18:07:21 +08:00
ihugo f6dabb5e36 Merge branch 'develop' into feature/settings-rebase 
# Conflicts:
#	CoreDataStack/CoreData.xcdatamodeld/CoreData.xcdatamodel/contents
#	Localization/app.json
#	Mastodon/Generated/Assets.swift
#	Mastodon/Generated/Strings.swift
#	Mastodon/Resources/en.lproj/Localizable.strings
#	Mastodon/Scene/HomeTimeline/HomeTimelineViewController+DebugAction.swift
 2021-04-17 14:13:01 +08:00
sunxiaojian bc588e08db Merge branch 'develop' into feature/notification 2021-04-16 22:40:36 +08:00
CMK 680cf9a827 feat: add blurhash image and update content warning 2021-04-16 20:08:32 +08:00
CMK 0eff43e1d1 feat: update compose scene UI appearance 2021-04-14 15:24:54 +08:00
sunxiaojian 773bfb6dd2 feature: notification API and CoreData 2021-04-13 19:56:35 +08:00
CMK fccf9ee080 Merge branch 'develop' into feature/post-thread 
# Conflicts:
#	Mastodon.xcodeproj/project.pbxproj
 2021-04-13 19:48:13 +08:00