Source code for the custom Mastodon (Glitchsoc) instance on berserker.town. https://berserker.town/

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.

Tag: Branch: Tree: fe5f6bc7ed

local

main

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'fe5f6bc7ed'

${ noResults }

microblog/app/javascript/packs

History

Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property		2 years ago
..
about.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	4 years ago
admin.js	Pre-fill domain block/allow domain from search filter (#18172)	2 years ago
application.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	4 years ago
common.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	4 years ago
error.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	4 years ago
public-path.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	4 years ago
public.js	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
share.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	4 years ago