Merge branch 'master' into relicensing-add-sean

viktorklang · web-flow · commit de5f86d7e806 · 2020-08-17T07:25:28.000Z
diff --git a/Relicensing.txt b/Relicensing.txt
@@ -24,3 +24,4 @@ ouertani       | Slim Ouertani, ouertani@gmail.com
 egetman        | Evgeniy Getman, getman.eugene@gmail.com
 ktoso          | Konrad Malawski, konrad.malawski@project13.pl
 sullis         | Sean Sullivan, github@seansullivan.com
+jroper         | James Roper, james@jazzy.id.au, Lightbend Inc.

-Original file line number
+Diff line change
 egetman        | Evgeniy Getman, [email protected]
 ktoso          | Konrad Malawski, [email protected]
 sullis         | Sean Sullivan, [email protected]
 +jroper         | James Roper, [email protected], Lightbend Inc.