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>
	Mon, 9 Aug 2021 21:25:49 +0000 (23:25 +0200)
committer	Claire <claire.github-309c@sitedethib.com>
	Mon, 9 Aug 2021 21:25:49 +0000 (23:25 +0200)
commit	8ec4be4233d2bfd9142860b25df639fc23655f0f
tree	e0b7f33c4ae22827a7a56aa9cac5fabdd77ee57f	tree \| snapshot
parent	a61645ed30b854a1b4935026801eb5b287954095	commit \| diff
parent	4ac78e2a066508a54de82f1d910ef2fd36c3d106	commit \| diff

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

Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream-updated dependency (redis) textually too
  close to glitch-soc-only dependecy.
  Updated redis gem like upstream did.

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	diff1 \|	diff2 \|	blob \| history
app/lib/activitypub/activity/create.rb	diff1 \|	diff2 \|	blob \| history
config/navigation.rb	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
yarn.lock	diff1 \|	diff2 \|	blob \| history

source code fur Kibicat Mastodon

RSS Atom

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	diff1 \|	diff2 \|	blob \| history
app/lib/activitypub/activity/create.rb	diff1 \|	diff2 \|	blob \| history
config/navigation.rb	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
yarn.lock	diff1 \|	diff2 \|	blob \| history