Skip to content
Commit 387e72a9 authored by John's avatar John
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	ballontranslator/data/translate/ru_RU.qm
#	ballontranslator/data/translate/ru_RU.ts
#	ballontranslator/data/translate/zh_CN.ts
#	requirements.txt
parents e8ddaf82 956ebff1
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment