mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-01-23 21:16:44 +00:00
980c004f06
Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one |
||
|---|---|---|
| .. | ||
| admin | ||
| concerns | ||
| form | ||
| web | ||
| account.rb | ||
| account_alias.rb | ||
| account_conversation.rb | ||
| account_domain_block.rb | ||
| account_filter.rb | ||
| account_identity_proof.rb | ||
| account_migration.rb | ||
| account_moderation_note.rb | ||
| account_pin.rb | ||
| account_stat.rb | ||
| account_tag_stat.rb | ||
| account_warning.rb | ||
| account_warning_preset.rb | ||
| admin.rb | ||
| application_record.rb | ||
| backup.rb | ||
| block.rb | ||
| bookmark.rb | ||
| context.rb | ||
| conversation.rb | ||
| conversation_mute.rb | ||
| custom_emoji.rb | ||
| custom_emoji_category.rb | ||
| custom_emoji_filter.rb | ||
| custom_filter.rb | ||
| direct_feed.rb | ||
| domain_allow.rb | ||
| domain_block.rb | ||
| email_domain_block.rb | ||
| export.rb | ||
| favourite.rb | ||
| featured_tag.rb | ||
| feed.rb | ||
| follow.rb | ||
| follow_request.rb | ||
| home_feed.rb | ||
| identity.rb | ||
| import.rb | ||
| instance.rb | ||
| instance_filter.rb | ||
| invite.rb | ||
| invite_filter.rb | ||
| list.rb | ||
| list_account.rb | ||
| list_feed.rb | ||
| marker.rb | ||
| media_attachment.rb | ||
| mention.rb | ||
| mute.rb | ||
| notification.rb | ||
| poll.rb | ||
| poll_vote.rb | ||
| preview_card.rb | ||
| relay.rb | ||
| remote_follow.rb | ||
| report.rb | ||
| report_filter.rb | ||
| report_note.rb | ||
| scheduled_status.rb | ||
| search.rb | ||
| session_activation.rb | ||
| setting.rb | ||
| site_upload.rb | ||
| status.rb | ||
| status_pin.rb | ||
| status_stat.rb | ||
| tag.rb | ||
| tag_filter.rb | ||
| tombstone.rb | ||
| trending_tags.rb | ||
| user.rb | ||
| user_invite_request.rb | ||
| web.rb | ||