mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2025-01-10 22:16:56 +01:00
caccc2e0f4
# Conflicts: # README.md # app/javascript/flavours/glitch/components/status.jsx # app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx # app/javascript/flavours/glitch/locales/en.json # app/javascript/flavours/glitch/reducers/compose.js # app/javascript/flavours/glitch/styles/components.scss # app/javascript/mastodon/reducers/compose.js # app/models/notification.rb |
||
---|---|---|
.. | ||
admin_report.jsx | ||
admin_signup.jsx | ||
checkbox_with_label.jsx | ||
clear_column_button.jsx | ||
column_settings.jsx | ||
filter_bar.jsx | ||
filtered_notifications_banner.jsx | ||
follow.jsx | ||
follow_request.jsx | ||
grant_permission_button.jsx | ||
notification.jsx | ||
notification_request.jsx | ||
notifications_permission_banner.jsx | ||
overlay.jsx | ||
pill_bar_button.jsx | ||
report.jsx | ||
setting_toggle.jsx |