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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: d7c1c41 88d69d3)

author	Claire <claire.github-309c@sitedethib.com>
	Wed, 24 Mar 2021 09:53:50 +0000 (10:53 +0100)
committer	Claire <claire.github-309c@sitedethib.com>
	Wed, 24 Mar 2021 09:53:50 +0000 (10:53 +0100)
commit	f60c99a8fb0c99554fce091cac61d9ed07eef573
tree	27457a4e091b820269daedb2f709ca304bcf5d06	tree \| snapshot
parent	d7c1c41859549212a6d34ad869fded16acc17b48	commit \| diff
parent	88d69d3261c2f02278d07dc302ff7fc15bd68e8c	commit \| diff

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

17 files changed:

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/compose/components/compose_form.js	diff1 \|	diff2 \|	blob \| history
app/lib/activitypub/activity/create.rb	diff1 \|	diff2 \|	blob \| history
app/lib/feed_manager.rb	diff1 \|	diff2 \|	blob \| history
app/lib/settings/scoped_settings.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/views/layouts/application.html.haml	diff1 \|	diff2 \|	blob \| history
config/environments/production.rb	diff1 \|	diff2 \|	blob \| history
config/initializers/content_security_policy.rb	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
spec/controllers/api/v1/accounts/credentials_controller_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/controllers/application_controller_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/lib/activitypub/activity/create_spec.rb	diff1 \|	diff2 \|	blob \| history
streaming/index.js	diff1 \|	diff2 \|	blob \| history
yarn.lock	diff1 \|	diff2 \|	blob \| history

source code fur Kibicat Mastodon