nodebb/public/language/zh-CN
barisusakli 08dd412896 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	src/upgrade.js
..
admin Merge remote-tracking branch 'refs/remotes/origin/master' into develop
category.json Latest translations and fallbacks
email.json Latest translations and fallbacks
error.json Latest translations and fallbacks
flags.json flag translations and fallbacks
global.json Latest translations and fallbacks
groups.json Latest translations and fallbacks
language.json Standard language codes ()
login.json Latest translations and fallbacks
modules.json Latest translations and fallbacks
notifications.json Latest translations and fallbacks
pages.json Latest translations and fallbacks
recent.json Standard language codes ()
register.json Latest translations and fallbacks
reset_password.json Standard language codes ()
search.json Latest translations and fallbacks
success.json Standard language codes ()
tags.json Latest translations and fallbacks
topic.json Latest translations and fallbacks
unread.json Latest translations and fallbacks
uploads.json Standard language codes ()
user.json Latest translations and fallbacks
users.json Latest translations and fallbacks