3 Commits (64342a87b4a5c803198190ba130b83642a5fd0c8)

Author	SHA1	Message	Date
Claire	9b861d56a9	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Copied upstream changes. - `app/controllers/settings/identity_proofs_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `app/controllers/well_known/keybase_proof_config_controller.rb`: Minor conflict due to glitch-soc's extra “enable_keybase” setting. Upstream removed keybase support altogether, so did the same. - `lib/mastodon/statuses_cli.rb`: Minor conflict due to an optimization that wasn't shared between the two versions. Copied upstream's version.	2021-11-26 22:53:55 +01:00
atsu1125	7bc7da565b	translation glitch's preferences [ja]	2021-10-20 13:04:50 +09:00
Thibaut Girka	041c769182	Move glitch-specific ruby-side locales to their own files	2020-05-30 12:54:17 +02:00