]> cat aescling's git repositories - mastodon.git/commit
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 3 Jun 2019 12:54:30 +0000 (14:54 +0200)
committerThibaut Girka <thib@sitedethib.com>
Mon, 3 Jun 2019 12:54:30 +0000 (14:54 +0200)
commit76918554a6898f9b94d4ffde07face01754fd058
treefa394c02128610793353c0a6ba8363d814147ea4
parent35c4ff07f4d61aaf7ade2ae17060298d62b3f643
parentf2f5c1bd6d37ec2ba7d0f98a3c0f8fead6b78f1d
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream

Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
Gemfile
Gemfile.lock
app/javascript/mastodon/features/compose/components/compose_form.js
app/javascript/styles/mastodon/components.scss
config/settings.yml
config/webpack/rules/css.js
db/schema.rb
package.json
spec/services/notify_service_spec.rb
yarn.lock