mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 22:59:46 +09:00
4ed09276d5
Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them. |
||
|---|---|---|
| .. | ||
| action_bar.jsx | ||
| autosuggest_account.jsx | ||
| character_counter.jsx | ||
| compose_form.jsx | ||
| emoji_picker_dropdown.jsx | ||
| language_dropdown.jsx | ||
| navigation_bar.jsx | ||
| poll_button.jsx | ||
| poll_form.jsx | ||
| privacy_dropdown.jsx | ||
| reply_indicator.jsx | ||
| search_results.jsx | ||
| search.jsx | ||
| text_icon_button.jsx | ||
| upload_button.jsx | ||
| upload_form.jsx | ||
| upload_progress.jsx | ||
| upload.jsx | ||
| warning.jsx | ||