kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 6.0

This commit is contained in:
Wu Sheng 2018-07-11 14:48:35 -07:00
parent 736d7ae03f ccf5ef4673
commit 2892a987f5
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NOTICE
View File

@ -4,7 +4,8 @@ Copyright 2017-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
This product bundles icons/fonts from the ant-design project,
This product bundles icons/fonts in skywalking-ui/public/font/iconfont folder
from the ant-design project,
https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont
Licensed under the MIT license, confirmed by ant-design team member.
https://github.com/ant-design/ant-design/issues/10243

10
apm-dist/release-docs/NOTICE
View File

@ -4,6 +4,11 @@ Copyright 2017-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
This product bundles icons/fonts from the ant-design project,
https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont
Licensed under the MIT license, confirmed by ant-design team member.
https://github.com/ant-design/ant-design/issues/10243
========================================================================
grpc-java NOTICE
@ -831,8 +836,3 @@ from and not be held liable to the user for any such damages as noted
above as far as the program is concerned.
------
This product bundles icons/fonts from the ant-design project,
https://github.com/ant-design/antd-init/tree/master/examples/local-iconfont
Licensed under the MIT license, confirmed by ant-design team member.
https://github.com/ant-design/ant-design/issues/10243