mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-30 21:29:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/admin/dashboard
History
Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58:44 +01:00
..
index.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00