Calendar & Localization #282

Merged
khansultan1 merged 2 commits from dev_aamir into master 10 hours ago

2 Commits (main)

Author SHA1 Message Date
aamir-csol 6a180d10de Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
10 hours ago
aamir-csol 697642143c Translation & Calender 10 hours ago