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: 2c2f649 c88d9e5)

author	Thibaut Girka <thib@sitedethib.com>
	Sat, 4 May 2019 14:37:26 +0000 (16:37 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Sat, 4 May 2019 14:37:26 +0000 (16:37 +0200)
commit	33c80e07838d932efc6214cb1642cefaeb624b67
tree	51cae2d9096888cc27ae38ec4b0ceceb1853bb73	tree \| snapshot
parent	2c2f649200ba5b742ba9d17ac5ba553c752b59aa	commit \| diff
parent	c88d9e524b02cba895de9bdb7cba0e29e37703d5	commit \| diff

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

Conflicts:
- app/models/media_attachment.rb

14 files changed:

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/controllers/auth/registrations_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/settings/notifications_controller.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/compose/components/compose_form.js	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	diff1 \|	diff2 \|	blob \| history
app/models/media_attachment.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/views/stream_entries/_simple_status.html.haml	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history
lib/mastodon/version.rb	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
yarn.lock	diff1 \|	diff2 \|	blob \| history

source code fur Kibicat Mastodon