You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Eugen Rochko dac14696a0 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.		2 years ago
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
flavours	[Glitch] Add interaction modal to logged-out web UI	2 years ago
fonts	Theme: Windows 95	7 years ago
icons	Fix wrong aspect ratio of logo in icons (#18639)	2 years ago
images	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mastodon	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2 years ago
packs	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
skins	Glitchsoc translation to 'es' language (#1439)	4 years ago
styles	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	2 years ago