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: 6cd5b3b aec70b4)

author	David Yip <yipdw@member.fsf.org>
	Mon, 16 Oct 2017 14:23:59 +0000 (09:23 -0500)
committer	David Yip <yipdw@member.fsf.org>
	Mon, 16 Oct 2017 14:23:59 +0000 (09:23 -0500)
commit	dbb1fce94dbd877d795898933ca344359f9b74c1
tree	06ab5f2ae7714b41aa9e5cc19ac8c234e0f394be	tree \| snapshot
parent	6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc	commit \| diff
parent	aec70b44fc551db6471c8bc5210688b154ac661f	commit \| diff

Merge remote-tracking branch 'upstream/master' into gs-master

15 files changed:

app/javascript/mastodon/components/icon_button.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/components/status_action_bar.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/containers/mastodon.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/account/components/header.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/compose/index.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/status/components/detailed_status.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/main.js	diff1 \|	diff2 \|	blob \| history
app/javascript/packs/common.js	diff1 \|	diff2 \|	blob \| history
app/lib/feed_manager.rb	diff1 \|	diff2 \|	blob \| history
app/lib/user_settings_decorator.rb	diff1 \|	diff2 \|	blob \| history
app/serializers/initial_state_serializer.rb	diff1 \|	diff2 \|	blob \| history
app/views/stream_entries/_detailed_status.html.haml	diff1 \|	diff2 \|	blob \| history
config/settings.yml	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
yarn.lock	diff1 \|	diff2 \|	blob \| history

source code fur Kibicat Mastodon

This page took 0.041719 seconds and 3 git commands to generate.