luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-19 11:48:46 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Claire ce12934f5b Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency.
2023-04-09 11:45:08 +02:00
..
chewy
controllers Merge branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +02:00
helpers Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +02:00
lib Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
mailers
models Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
policies
presenters
serializers Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +02:00
validators Fix most rubocop issues (#2165) 2023-04-09 11:25:30 +02:00
views Fix glitch-soc HAML linting issues (#2166) 2023-04-07 20:55:28 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2023-04-01 14:31:05 +02:00