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

Merge branch 'feature-virtual-citizens' 

# Conflicts:
#	src/RealTime/Localization/Translations/es.xml
#	src/RealTime/Localization/Translations/fr.xml
parents ac0983ec 82794f15
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