Merge pull request scala#6600 from SethTisue/merge-2.12.x-to-2.13.x-2…

…0180504 merge 2.12.x to 2.13.x
dyuval · May 4, 2018 · 0d56e03 · 0d56e03
2 parents abf21b9 + 2ed878c
commit 0d56e03
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 15 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1 @@
+all repositories in the [scala](https://github.com/scala) and [scalacenter](https://github.com/scalacenter) organizations are covered by the Scala Code of Conduct: https://scala-lang.org/conduct/
diff --git a/doc/LICENSE.md b/doc/LICENSE.md
@@ -56,5 +56,4 @@ This license is used by the following third-party libraries:
 This license is used by the following third-party libraries:
 
   * jquery
-  * sizzle
   * tools tooltip
diff --git a/doc/License.rtf b/doc/License.rtf
@@ -53,5 +53,4 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \'93AS IS\'9
 
 \fs26 This license is used by the following third-party libraries:\
 	\'95	jquery\
-	\'95	sizzle\
 	\'95	tools tooltip\
diff --git a/doc/licenses/mit_sizzle.txt b/doc/licenses/mit_sizzle.txt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		all repositories in the [scala](https://github.com/scala) and [scalacenter](https://github.com/scalacenter) organizations are covered by the Scala Code of Conduct: https://scala-lang.org/conduct/