-
Notifications
You must be signed in to change notification settings - Fork 17
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
将https://改为// #3
base: master
Are you sure you want to change the base?
Conversation
将需要改动的部分替换为xxxx,将北京地图改为苏州
因为 gdgdocs.org 的代理暂时不支持 https ,所以即便将 map 中的 url 修改为 // 也无法使用。 |
@@ -26,16 +26,26 @@ | |||
<section> | |||
<img src="images/logo/developers-logo.svg" id="developers"> | |||
<p>DevFest 是 Google 赞助发起的全球性开发者活动,活动内容完全由世界各地的 GDG 社区志愿者自行策划组织。 | |||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
目测是 merge 的时候出问题了吧
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
谢谢提示!这个问题在最新版本中应该已经解决了,现在是正常显示的
发自 Windows 邮件
发件人: Glow Chiang
发送时间: 2014年9月29日, 星期一 10:32
收件人: gdgbeijing/devfest2014
抄送: DerekGrant
In event-about.html:
@@ -26,16 +26,26 @@
DevFest 是 Google 赞助发起的全球性开发者活动,活动内容完全由世界各地的 GDG 社区志愿者自行策划组织。
+<<<<<<< HEAD
目测是 merge 的时候出问题了吧
—
Reply to this email directly or view it on GitHub.
…ith maps.dushu.hu
在google-apis/google-client-api.html, google-apis/google-jsapi.html ,google-apis/google-maps-api.html , google-apis/google-plusone-api.html中将https://改为//,以让浏览器自动选择地图加载方式