1488be7d96
Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json |
||
---|---|---|
.. | ||
account/components | ||
account_gallery | ||
account_timeline | ||
blocks | ||
community_timeline | ||
compose | ||
direct_timeline | ||
domain_blocks | ||
emoji | ||
favourited_statuses | ||
favourites | ||
follow_requests | ||
followers | ||
following | ||
generic_not_found | ||
getting_started | ||
hashtag_timeline | ||
home_timeline | ||
introduction | ||
keyboard_shortcuts | ||
list_adder | ||
list_editor | ||
list_timeline | ||
lists | ||
mutes | ||
notifications | ||
pinned_statuses | ||
public_timeline | ||
reblogs | ||
report | ||
search | ||
standalone | ||
status | ||
ui | ||
video |