Eugen Rochko bf3cb42da7 Add server banner to web app, add GET /api/v2/instance to REST API (#19294) ... Cherry-picked d2528b26b6 Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream changed stuff, we had extra attributes. Applied upstream changes while keeping our extra attributes. - `app/serializers/rest/instance_serializer.rb`: Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`, so updated that file by keeping our extra attributes, and took upstream's version of `app/serializers/rest/instance_serializer.rb`. - `spec/views/about/show.html.haml_spec.rb`: Took upstream's version.		2022-10-09 19:51:39 +02:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
flavours	[Glitch] Add interaction modal to logged-out web UI	2022-10-09 18:23:15 +02:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
icons	Fix wrong aspect ratio of logo in icons (#18639)	2022-06-11 20:32:02 +02:00
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-21 08:28:59 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Add server banner to web app, add GET /api/v2/instance to REST API (#19294)	2022-10-09 19:51:39 +02:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-08 15:49:40 +02:00
skins	Glitchsoc translation to 'es' language (#1439)	2020-10-19 22:17:29 +02:00
styles	Add server banner to web app, add GET /api/v2/instance to REST API (#19294)	2022-10-09 19:51:39 +02:00