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: 0128509 e265b88)

author	Thibaut Girka <thib@sitedethib.com>
	Thu, 5 Sep 2019 09:36:41 +0000 (11:36 +0200)
committer	Thibaut Girka <thib@sitedethib.com>
	Thu, 5 Sep 2019 09:36:41 +0000 (11:36 +0200)
commit	5088eb8388fbfcb210a518f918ae5332e6d3979e
tree	20b9394200b79e7eefc234cc50b0f3650e9afc1d	tree \| snapshot
parent	0128509605ed90ee5a29d6af2347ab32bd46aeb9	commit \| diff
parent	e265b8887dbd883bc7ca04832dc67ffe46966889	commit \| diff

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

17 files changed:

.circleci/config.yml	diff1 \|	diff2 \|	blob \| history
.env.production.sample	diff1 \|	diff2 \|	blob \| history
Gemfile	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	diff1 \|	diff2 \|	blob \| history
app/controllers/auth/confirmations_controller.rb	diff1 \|	diff2 \|	blob \| history
app/javascript/core/admin.js	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/defaultMessages.json	diff1 \|	diff2 \|	blob \| history
app/javascript/mastodon/locales/en.json	diff1 \|	diff2 \|	blob \| history
app/javascript/styles/mastodon/components.scss	diff1 \|	diff2 \|	blob \| history
app/lib/feed_manager.rb	diff1 \|	diff2 \|	blob \| history
app/serializers/activitypub/note_serializer.rb	diff1 \|	diff2 \|	blob \| history
app/views/directories/index.html.haml	diff1 \|	diff2 \|	blob \| history
config/environments/production.rb	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history
package.json	diff1 \|	diff2 \|	blob \| history
yarn.lock	diff1 \|	diff2 \|	blob \| history

source code fur Kibicat Mastodon