Merge remote-tracking branch 'github/master' · Progressbar-Discord-Server/ProgressArchiver95@5a3a0f3 · GitHub

Commit

Merge remote-tracking branch 'github/master'

Browse files

# Conflicts:
#	app/build.gradle
#	app/src/main/res/values-pt-rBR/strings.xml

Loading branch information

luihum committed Dec 17, 2021

2 parents d886970 + 935b977 commit 5a3a0f3