Fix typo in discussion activity i18n
Bringing in Harry Wang's Chinese translation
Merge branch 'activityTypo' of https://github.com/bp323/3akai-ux into activityTypo
Merge branch 'master' into chinese
Remove unused Chinese keys from core bundle
Removing unused Chinese keys
Removing unused Chinese keys from widgets
Self review
Increase proxy_read_timeout for long operations, disable retries on 'create' actions
Alphabetical ordering of app server request blocks
Correctly showing revisions
Renamed oae-update-picture to oae.changepic.update
Implemented alternative IE10 placeholder fix
Fixed issue where private users were still rendered as links instead of static text in comments
Fixed issue where private users were still rendered as links instead of static text in comments
Merge branch 'displaynameissue' of https://github.com/Coenego/3akai-ux into displaynameissue
Follow up on private user comment links
Merge origin/master and fix conflicts