mirror of https://github.com/glitch-soc/mastodon
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. |
||
|---|---|---|
| .. | ||
| _account.html.haml | ||
| _button.html.haml | ||
| _checklist.html.haml | ||
| _feature.html.haml | ||
| _follow.html.haml | ||
| _frame.html.haml | ||
| _hashtag.html.haml | ||
| _heading.html.haml | ||