Glitch-Shrike/app/views
Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
2019-06-10 18:59:53 +02:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
accounts Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2019-06-07 17:00:36 +02:00
admin_mailer Add invite request to pending account notification e-mail (#10528) 2019-04-10 00:36:01 +02:00
application
auth Fix sign up button not saying sign up when invite is used (#10623) 2019-04-23 04:39:21 +02:00
authorize_interactions
directories
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
media
notification_mailer
oauth
public_timelines
relationships
remote_follow
remote_interaction
remote_unfollows
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
shared
shares
stream_entries Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
tags
user_mailer
well_known