155dc4bc4b
Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly. |
||
|---|---|---|
| .. | ||
| admin.tsx | ||
| application.ts | ||
| common.js | ||
| embed.tsx | ||
| error.ts | ||
| inert.ts | ||
| mailer.ts | ||
| public-path.ts | ||
| public.tsx | ||
| remote_interaction_helper.ts | ||
| share.tsx | ||
| sign_up.ts | ||
| two_factor_authentication.ts | ||