Merge remote-tracking branch 'origin/master' into angular.ossez.com

aio/content/navigation.json

@@ -1133,7 +1133,7 @@
         },
         {
           "title": "简体中文版",
-          "url": "https://angular.cn/"
+          "url": "https://angular.ossez.com/"
         },
         {
           "title": "正體中文版",

angular-docs-cn.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/aio/tools/examples/shared/boilerplate/cli/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/aio/tools/examples/shared/boilerplate/cli/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>