cat aescling's git repositories - mastodon.git/commit

]> cat aescling's git repositories - mastodon.git/commit

cat aescling's git repositories / mastodon.git / commit

author	Claire <claire.github-309c@sitedethib.com>
	Thu, 14 Oct 2021 18:55:16 +0000 (20:55 +0200)
committer	Claire <claire.github-309c@sitedethib.com>
	Thu, 14 Oct 2021 19:44:57 +0000 (21:44 +0200)
commit	694c073d1f94a54a0ccf19299e06f1de849c6edb
tree	77e9855f70000396b8a6b793ac8a8dbb61c82783	tree \| snapshot
parent	ebf2c3195615bb524f6908e84f99887c8775cbc3	commit \| diff
parent	9b978872cc1a86c7d82afda4060c909dc7ca2536	commit \| diff

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/admin/dashboard_controller.rb`:
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram.
- `app/views/admin/dashboard/index.html.haml`
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram.

source code fur Kibicat Mastodon

RSS Atom

Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/helpers/application_helper.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/core/admin.js	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/admin.scss	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	diff1 \|	diff2 \|	blob \| history
app/models/status.rb	diff1 \|	diff2 \|	blob \| history
app/presenters/instance_presenter.rb	diff1 \|	diff2 \|	blob \| history
app/services/post_status_service.rb	diff1 \|	diff2 \|	blob \| history
app/views/admin/dashboard/index.html.haml	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history