This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 45deca65b3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.		2020-07-01 19:23:14 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-01 19:23:14 +02:00
flavours	[Glitch] Add user notes on accounts	2020-06-30 23:32:02 +02:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-01 19:23:14 +02:00
packs	Fix lock icon not being shown when locking account in profile settings (#14190)	2020-07-01 13:51:50 +02:00
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-01 19:23:14 +02:00