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

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

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

author	Thibaut Girka <thib@sitedethib.com>
	Sun, 26 May 2019 13:41:40 +0000 (15:41 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Sun, 26 May 2019 13:41:40 +0000 (15:41 +0200)
commit	20d01a954e0961eed41954bd23713e91a1dafe14
tree	a7a8ba480fabe4f669755ef4c0b78e213b1ea2ac	tree \| snapshot
parent	fdb3952b203d562ba32ba3131d941fa4ea07d7b3	commit \| diff
parent	63483ee543eb6c81e2cf6450a682cdb657e92751	commit \| diff

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

Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.

source code fur Kibicat Mastodon

RSS Atom

app/controllers/settings/preferences_controller.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/initial_state.js	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	diff1 \|	diff2 \|	blob \| history
app/lib/user_settings_decorator.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/serializers/initial_state_serializer.rb	diff1 \|	diff2 \|	blob \| history
app/views/settings/preferences/show.html.haml	diff1 \|	diff2 \|	blob \| history
config/locales/simple_form.en.yml	diff1 \|	diff2 \|	blob \| history
config/settings.yml	diff1 \|	diff2 \|	blob \| history
lib/mastodon/version.rb	diff1 \|	diff2 \|	blob \| history