honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/angular.io/master' into merge-review-rex 

# Conflicts:
#	public/_includes/_hero-home.jade
This commit is contained in:
rexebin 2016-11-05 14:24:01 +00:00
parent 5c46ddf7a7
commit 2aa5e71df4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/_includes/_hero-home.jade
View File

@ -11,6 +11,7 @@ header(class="background-sky l-relative")
p <strong>2016 Google 开发者大会来啦！（北京 & 上海）</strong>
a(href="http://www.google.cn/intl/zh-CN/events/developerday2016/" target="_blank" class="button md-button") 立即报名
.announcement-bar-slide.clearfix
img(src="/resources/images/logos/anglebrackets/devintersection.png" width="64")
p 参加<strong>DEVintersection Amsterdam</strong> 11月 14-16号！
p <strong>参加11月14-16号在阿姆斯特丹召开的DEVintersection</strong>！
a(href="https://www.devintersectioneurope.com/#!/" target="_blank" class="button md-button") 立即报名