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>
	Wed, 7 Aug 2019 11:56:48 +0000 (13:56 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Wed, 7 Aug 2019 11:56:48 +0000 (13:56 +0200)
commit	04534604c654060eca24628247fdb51b7ff5372a
tree	f8ae222e84056fb2674d23187e66517da1fc2af9	tree \| snapshot
parent	8400ddca7155005ab79485ed6054c04ea3ca5667	commit \| diff
parent	ac33f1aedd9a6c72c6c176afb1f5d62a1ce5d44d	commit \| diff

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

Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml

23 files changed:

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/controllers/admin/dashboard_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/directories_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/settings/preferences_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/tags_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/formatter.rb	diff1 \|	diff2 \|	blob \| history
app/lib/user_settings_decorator.rb	diff1 \|	diff2 \|	blob \| history
app/models/account.rb	diff1 \|	diff2 \|	blob \| history
app/models/form/admin_settings.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/serializers/initial_state_serializer.rb	diff1 \|	diff2 \|	blob \| history
app/services/batched_remove_status_service.rb	diff1 \|	diff2 \|	blob \| history
app/services/fan_out_on_write_service.rb	diff1 \|	diff2 \|	blob \| history
app/services/remove_status_service.rb	diff1 \|	diff2 \|	blob \| history
app/views/admin/dashboard/index.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/admin/settings/edit.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/settings/preferences/appearance/show.html.haml	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
config/locales/simple_form.en.yml	diff1 \|	diff2 \|	blob \| history
config/settings.yml	diff1 \|	diff2 \|	blob \| history

source code fur Kibicat Mastodon

RSS Atom

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/controllers/admin/dashboard_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/directories_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/settings/preferences_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/tags_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/formatter.rb	diff1 \|	diff2 \|	blob \| history
app/lib/user_settings_decorator.rb	diff1 \|	diff2 \|	blob \| history
app/models/account.rb	diff1 \|	diff2 \|	blob \| history
app/models/form/admin_settings.rb	diff1 \|	diff2 \|	blob \| history
app/models/user.rb	diff1 \|	diff2 \|	blob \| history
app/serializers/initial_state_serializer.rb	diff1 \|	diff2 \|	blob \| history
app/services/batched_remove_status_service.rb	diff1 \|	diff2 \|	blob \| history
app/services/fan_out_on_write_service.rb	diff1 \|	diff2 \|	blob \| history
app/services/remove_status_service.rb	diff1 \|	diff2 \|	blob \| history
app/views/admin/dashboard/index.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/admin/settings/edit.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/settings/preferences/appearance/show.html.haml	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
config/locales/simple_form.en.yml	diff1 \|	diff2 \|	blob \| history
config/settings.yml	diff1 \|	diff2 \|	blob \| history