Commit 65a236b279c01178ac8c2094c2d4f254ead92dc1

Authored by wb
2 parents cc7fa158 e0d1dedb

Merge branch 'branch' of http://192.168.1.195:9998/web_developers/javaplatform.git into branch

index.html
@@ -2,9 +2,8 @@ @@ -2,9 +2,8 @@
2 <html lang="en"> 2 <html lang="en">
3 <head> 3 <head>
4 <meta charset="UTF-8"> 4 <meta charset="UTF-8">
5 - <meta name="renderer" content="webkit">  
6 - <meta name="renderer" content="ie-comp">  
7 - <meta name="renderer" content="ie-stand"> 5 + <meta http-equiv="X-UA-Compatible" content="edge" />
  6 + <meta http-equiv="X-UA-Compatible" content="IE=edge">
8 <meta name="google" content="notranslate" /> 7 <meta name="google" content="notranslate" />
9 <meta http-equiv="pragma" content="no-cache"> 8 <meta http-equiv="pragma" content="no-cache">
10 <meta http-equiv="cache-control" content="no-cache"> 9 <meta http-equiv="cache-control" content="no-cache">
login.html
@@ -2,9 +2,8 @@ @@ -2,9 +2,8 @@
2 <html lang="en"> 2 <html lang="en">
3 <head> 3 <head>
4 <meta charset="UTF-8"> 4 <meta charset="UTF-8">
5 - <meta name="renderer" content="webkit">  
6 - <meta name="renderer" content="ie-comp">  
7 - <meta name="renderer" content="ie-stand"> 5 + <meta http-equiv="X-UA-Compatible" content="edge" />
  6 + <meta http-equiv="X-UA-Compatible" content="IE=edge">
8 <meta name="google" content="notranslate" /> 7 <meta name="google" content="notranslate" />
9 <meta http-equiv="pragma" content="no-cache"> 8 <meta http-equiv="pragma" content="no-cache">
10 <meta http-equiv="cache-control" content="no-cache"> 9 <meta http-equiv="cache-control" content="no-cache">
pdalatform.html
@@ -2,9 +2,8 @@ @@ -2,9 +2,8 @@
2 <html lang="en"> 2 <html lang="en">
3 <head> 3 <head>
4 <meta charset="UTF-8"> 4 <meta charset="UTF-8">
5 - <meta name="renderer" content="webkit">  
6 - <meta name="renderer" content="ie-comp">  
7 - <meta name="renderer" content="ie-stand"> 5 + <meta http-equiv="X-UA-Compatible" content="edge" />
  6 + <meta http-equiv="X-UA-Compatible" content="IE=edge">
8 <meta name="google" content="notranslate" /> 7 <meta name="google" content="notranslate" />
9 <meta http-equiv="pragma" content="no-cache"> 8 <meta http-equiv="pragma" content="no-cache">
10 <meta http-equiv="cache-control" content="no-cache"> 9 <meta http-equiv="cache-control" content="no-cache">
thirdparty.html
@@ -2,9 +2,8 @@ @@ -2,9 +2,8 @@
2 <html lang="en"> 2 <html lang="en">
3 <head> 3 <head>
4 <meta charset="UTF-8"> 4 <meta charset="UTF-8">
5 - <meta name="renderer" content="webkit">  
6 - <meta name="renderer" content="ie-comp">  
7 - <meta name="renderer" content="ie-stand"> 5 + <meta http-equiv="X-UA-Compatible" content="edge" />
  6 + <meta http-equiv="X-UA-Compatible" content="IE=edge">
8 <meta name="google" content="notranslate" /> 7 <meta name="google" content="notranslate" />
9 <meta http-equiv="pragma" content="no-cache"> 8 <meta http-equiv="pragma" content="no-cache">
10 <meta http-equiv="cache-control" content="no-cache"> 9 <meta http-equiv="cache-control" content="no-cache">
wechatlatform.html
@@ -2,9 +2,8 @@ @@ -2,9 +2,8 @@
2 <html lang="en"> 2 <html lang="en">
3 <head> 3 <head>
4 <meta charset="UTF-8"> 4 <meta charset="UTF-8">
5 - <meta name="renderer" content="webkit">  
6 - <meta name="renderer" content="ie-comp">  
7 - <meta name="renderer" content="ie-stand"> 5 + <meta http-equiv="X-UA-Compatible" content="edge" />
  6 + <meta http-equiv="X-UA-Compatible" content="IE=edge">
8 <meta name="google" content="notranslate" /> 7 <meta name="google" content="notranslate" />
9 <meta http-equiv="pragma" content="no-cache"> 8 <meta http-equiv="pragma" content="no-cache">
10 <meta http-equiv="cache-control" content="no-cache"> 9 <meta http-equiv="cache-control" content="no-cache">