nyastodon/app/views
Jeremy Kescher b221a857f7
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	.github/workflows/build-image.yml
2022-11-17 23:38:08 +01:00
..
about Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
accounts Merge remote-tracking branch 'upstream/main' into develop 2022-11-10 21:11:05 +01:00
admin Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597) 2022-11-17 11:05:09 +01:00
admin_mailer
application Fix style for hashes (#20518) 2022-11-17 11:05:39 +01:00
auth Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
authorize_interactions Fix links to the Web UI in notifications (#19981) 2022-11-07 15:42:58 +01:00
custom_css
disputes/strikes Add null check on application in dispute viewer (#19851) 2022-11-07 03:40:17 +01:00
errors
filters
follower_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
following_accounts Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
home Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
invites
kaminari
layouts Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
media
notification_mailer Fix links to the Web UI in notifications (#19981) 2022-11-07 15:42:58 +01:00
oauth
privacy Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
relationships
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
shared Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
shares
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-11-17 12:01:37 +01:00
statuses_cleanup
tags Merge remote-tracking branch 'upstream/main' into develop 2022-10-31 21:37:48 +01:00
user_mailer
well_known/host_meta