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

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

author	David Yip <yipdw@member.fsf.org>
	Sun, 10 Sep 2017 04:56:21 +0000 (23:56 -0500)
committer	David Yip <yipdw@member.fsf.org>
	Sun, 10 Sep 2017 04:56:21 +0000 (23:56 -0500)
commit	67ad4533732f2e5cfc8c7f7ad3abaf7a5eb2647b
tree	011ea44fc94bcff6f8ec4e23c3edf887359243d2	tree \| snapshot
parent	3dff74eecf5387b92b862893248710d2efb90eec	commit \| diff
parent	90712d42933efd9978e4bbae82f81a4650aa4d84	commit \| diff

Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4

Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss

source code fur Kibicat Mastodon

RSS Atom

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

app/javascript/mastodon/actions/compose.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/components/status_action_bar.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/components/video_player.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/getting_started/index.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/ui/index.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/features/ui/util/async-components.js	diff1 \|	diff2 \|	blob \| history
app/javascript/packs/public.js	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/components.scss	diff1 \|	diff2 \|	blob \| history
app/services/post_status_service.rb	diff1 \|	diff2 \|	blob \| history