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: cd53483 f4f2239)

author	Thibaut Girka <thib@sitedethib.com>
	Wed, 15 May 2019 15:11:40 +0000 (17:11 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Wed, 15 May 2019 15:11:40 +0000 (17:11 +0200)
commit	6badf2d252a980d496b894c7258a778c57639953
tree	b7c71885c413a8205dbe9d01bab7c60ea75c11bf	tree \| snapshot
parent	cd534830adab89300703904ffe87894dec8e2f95	commit \| diff
parent	f4f22391b2d469bd1d5c29ec815daf020282f30c	commit \| diff

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

13 files changed:

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/controllers/home_controller.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	diff1 \|	diff2 \|	blob \| history
app/models/account.rb	diff1 \|	diff2 \|	blob \| history
app/models/status.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/services/post_status_service.rb	diff1 \|	diff2 \|	blob \| history
app/services/process_mentions_service.rb	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history
spec/lib/feed_manager_spec.rb	diff1 \|	diff2 \|	blob \| history
spec/services/notify_service_spec.rb	diff1 \|	diff2 \|	blob \| history

source code fur Kibicat Mastodon