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

author Thibaut Girka <thib@sitedethib.com>

Tue, 25 Feb 2020 13:28:13 +0000 (14:28 +0100)

committer Thibaut Girka <thib@sitedethib.com>

Tue, 25 Feb 2020 13:28:13 +0000 (14:28 +0100)
author Thibaut Girka <thib@sitedethib.com>
Tue, 25 Feb 2020 13:28:13 +0000 (14:28 +0100)
committer Thibaut Girka <thib@sitedethib.com>
Tue, 25 Feb 2020 13:28:13 +0000 (14:28 +0100)
diff --cc Gemfile
Simple merge
diff --cc Gemfile.lock
Simple merge
diff --cc app/services/backup_service.rb
Simple merge
diff --cc config/locales/en.yml
Simple merge
diff --cc package.json
Simple merge
diff --cc yarn.lock
Simple merge
author	Thibaut Girka <thib@sitedethib.com>
	Tue, 25 Feb 2020 13:28:13 +0000 (14:28 +0100)
committer	Thibaut Girka <thib@sitedethib.com>
	Tue, 25 Feb 2020 13:28:13 +0000 (14:28 +0100)
		1	2
Gemfile	patch \|	diff1 \|	diff2 \|	blob \| history
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history
app/services/backup_service.rb	patch \|	diff1 \|	diff2 \|	blob \| history
config/locales/en.yml	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history
yarn.lock	patch \|	diff1 \|	diff2 \|	blob \| history