1
0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-18 05:32:55 -05:00
Claire 86c9c5afa0 Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Upstream changed the order of Action Controller filters for web app
  controllers.
  Glitch-soc has an extra filter due to its theming system.
  Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to an extra newline in glitch-soc.
  Removed that newline and applied upstream's changes.
2023-10-08 17:26:43 +02:00
2016-02-20 22:53:20 +01:00
2017-12-03 23:26:40 -08:00
2017-07-27 22:30:27 +02:00
2023-09-29 09:50:15 +02:00
2016-02-25 00:17:01 +01:00
2017-07-27 22:30:27 +02:00
2023-09-21 14:42:15 +02:00
2023-09-21 16:51:32 +02:00
2023-10-02 13:16:02 +02:00
2023-09-06 16:28:31 +02:00
2020-04-27 17:19:53 +02:00
2018-06-26 20:34:12 +02:00
2023-07-12 09:47:54 +02:00
2023-09-08 16:17:55 +02:00

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?

Description
A glitchy but lovable microblogging server
https://toot-lab.reclaim.technology/
Readme AGPL-3.0
Languages
Ruby 49%
JavaScript 26.4%
TypeScript 13.2%
SCSS 7.7%
Haml 3.4%
Other 0.3%