Skip to content
Commit 9919f0fe authored by dymanoid's avatar dymanoid
Browse files

Merge branch 'feature-1.3' 

# Conflicts:
#	src/RealTime/Localization/Translations/fr.xml
#	src/RealTime/Localization/Translations/ko.xml
parents fb76ca89 879caecd
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment