mirror of https://github.com/tootsuite/mastodon
dcded13a99
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both. |
||
---|---|---|
.. | ||
accounts | ||
apps | ||
instances | ||
lists | ||
push | ||
statuses | ||
timelines | ||
accounts_controller.rb | ||
apps_controller.rb | ||
blocks_controller.rb | ||
bookmarks_controller.rb | ||
conversations_controller.rb | ||
custom_emojis_controller.rb | ||
domain_blocks_controller.rb | ||
endorsements_controller.rb | ||
favourites_controller.rb | ||
filters_controller.rb | ||
follow_requests_controller.rb | ||
follows_controller.rb | ||
instances_controller.rb | ||
lists_controller.rb | ||
media_controller.rb | ||
mutes_controller.rb | ||
notifications_controller.rb | ||
reports_controller.rb | ||
search_controller.rb | ||
statuses_controller.rb | ||
streaming_controller.rb | ||
suggestions_controller.rb |