Source code for the custom Mastodon (Glitchsoc) instance on 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: 93912f0498

b3ps

local

main

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '93912f0498'

${ noResults }

microblog/app/javascript

History

Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.		2 years ago
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
flavours	Add “Glitch-only” label to glitch-specific settings	2 years ago
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
icons	png optimization(loss less) (#19630)	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	Merge branch 'main' into glitch-soc/merge-upstream	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	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago