Merge branch 'master' into bagwell-kenji

Author: SethTisue

Gemfile.lock

@@ -59,7 +59,7 @@ GEM
     mercenary (0.3.6)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nokogiri (1.10.0)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     parallel (1.12.1)
     pathutil (0.16.2)
@@ -98,4 +98,4 @@ DEPENDENCIES
   jekyll-redirect-from
   kramdown
   rack-jekyll
-  rake
+  rake

_downloads/2019-09-10-2.12.10.md

@@ -0,0 +1,20 @@
+---
+title: Scala 2.12.10
+start: 10 September 2019
+layout: downloadpage
+release_version: 2.12.10
+release_date: "September 10, 2019"
+show_resources: "true"
+permalink: /download/2.12.10.html
+requirements: "This Scala software distribution can be installed on any Unix-like or Windows system. It requires Java 8 or later, available <a href='http://www.java.com/'>here</a>."
+resources: [
+  ["-main-unixsys", "scala-2.12.10.tgz", "https://downloads.lightbend.com/scala/2.12.10/scala-2.12.10.tgz", "Mac OS X, Unix, Cygwin", "19.71M"],
+  ["-main-windows", "scala-2.12.10.msi", "https://downloads.lightbend.com/scala/2.12.10/scala-2.12.10.msi", "Windows (msi installer)", "124M"],
+  ["-non-main-sys", "scala-2.12.10.zip", "https://downloads.lightbend.com/scala/2.12.10/scala-2.12.10.zip", "Windows", "19.75M"],
+  ["-non-main-sys", "scala-2.12.10.deb", "https://downloads.lightbend.com/scala/2.12.10/scala-2.12.10.deb", "Debian", "144.88M"],
+  ["-non-main-sys", "scala-2.12.10.rpm", "https://downloads.lightbend.com/scala/2.12.10/scala-2.12.10.rpm", "RPM package", "124.52M"],
+  ["-non-main-sys", "scala-docs-2.12.10.txz", "https://downloads.lightbend.com/scala/2.12.10/scala-docs-2.12.10.txz", "API docs", "53.21M"],
+  ["-non-main-sys", "scala-docs-2.12.10.zip", "https://downloads.lightbend.com/scala/2.12.10/scala-docs-2.12.10.zip", "API docs", "107.63M"],
+  ["-non-main-sys", "scala-sources-2.12.10.tar.gz", "https://github.com/scala/scala/archive/v2.12.10.tar.gz", "Sources", ""]
+]
+---

_events/2019-11-14-scale-bythebay.md renamed to _events/2019-11-13-scale-bythebay.md

@@ -2,9 +2,9 @@
 category: event
 title: Scale by the Bay
 logo: /resources/img/scalebythebay.png
-location: San Francisco, CA, USA
+location: Oakland, CA, USA
 description: ""
-start: 14 November 2019
-end: 16 November 2019
+start: 13 November 2019
+end: 15 November 2019
 link-out: http://scale.bythebay.io/
 ---

_posts/2019-09-10-release-notes-2.12.10.md

@@ -0,0 +1,8 @@
+---
+category: announcement
+permalink: /news/2.12.10
+title: "Scala 2.12.10 is now available!"
+---
+[Scala 2.12.10](https://github.com/scala/scala/releases/tag/v2.12.10) is now available! The main purpose of the release is to fix a few regressions in 2.12.9.
+
+For all the details, refer to the [release notes](https://github.com/scala/scala/releases/tag/v2.12.10) on GitHub.

conduct.md

@@ -91,6 +91,7 @@ listed above,
   * Adriaan Moors, Lightbend ([adriaan.moors@lightbend.com](mailto:adriaan.moors@lightbend.com))
   * Darja Jovanovic, Scala Center ([darja.jovanovic@epfl.ch](mailto:darja.jovanovic@epfl.ch))
   * Sébastien Doeraene, Scala Center ([sebastien.doeraene@epfl.ch](mailto:sebastien.doeraene@epfl.ch))
+  * Kathleen Hayes, Lightbend ([kathleen.hayes@lightbend.com](mailto:kathleen.hayes@lightbend.com))
 
 ### Credits
 

download/index.md

@@ -5,7 +5,7 @@ release_version: 2.13.0
 release_date: "June 11, 2019"
 show_resources: "true"
 other_releases: [
-  ["maintenance_version", "Latest 2.12.x maintenance release", 2.12.9, "August 5, 2019"],
+  ["maintenance_version", "Latest 2.12.x maintenance release", 2.12.10, "September 10, 2019"],
   ["maintenance_version", "Last 2.11.x maintenance release", 2.11.12, "November 9, 2017"],
   ["maintenance_version", "Last 2.10.x maintenance release", 2.10.7, "November 9, 2017"]
 ]