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: f48c768 b31b232)

author	Thibaut Girka <thib@sitedethib.com>
	Tue, 30 Jul 2019 10:22:33 +0000 (12:22 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Tue, 30 Jul 2019 10:22:33 +0000 (12:22 +0200)
commit	24968d20a07d483cd36b4747bd1db8bd512002c2
tree	d306d08bc32edba292cf9aa85c3be8ba009c1b1c	tree \| snapshot
parent	f48c7689d230b915ed740a4774736bd5998cbc66	commit \| diff
parent	b31b232edfcc7f04acf828bf6829ab716b290692	commit \| diff

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

Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock

19 files changed:

Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/controllers/about_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/directories_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/home_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/public_timelines_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/remote_interaction_controller.rb	diff1 \|	diff2 \|	blob \| history
app/controllers/tags_controller.rb	diff1 \|	diff2 \|	blob \| history
app/views/admin/settings/edit.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/layouts/public.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/navigation.rb	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
streaming/index.js	diff1 \|	diff2 \|	blob \| history
yarn.lock	diff1 \|	diff2 \|	blob \| history

source code fur Kibicat Mastodon