Merge branch 'master' into wip-relicencing-patriknw

viktorklang · web-flow · commit d4cfe61cd7a6 · 2020-08-13T10:47:52.000Z
diff --git a/Relicensing.txt b/Relicensing.txt
@@ -15,4 +15,9 @@ angelsanz      | Ángel Sanz, angelsanz@users.noreply.github.com
 shenghaiyang   | 盛海洋, shenghaiyang@aliyun.com
 colinrgodsey   | Colin Godsey, crgodsey@gmail.com
 patriknw       | Patrik Nordwall, patrik.nordwall@gmail.com, Lightbend Inc
-
+retronym       | Jason Zaugg, jzaugg@gmail.com, Lightbend Inc.
+ldaley         | Luke Daley, luke@gradle.com, Gradle Inc.
+davidmoten     | Dave Moten, davidmoten@gmail.com
+tomislavhofman | Tomislav Hofman, tomislav.hofman@gmail.com
+rstoyanchev    | Rossen Stoyanchev, rstoyanchev@vmware.com, VMware
+ouertani       | Slim Ouertani, ouertani@gmail.com

-Original file line number
+Diff line change
 shenghaiyang   | 盛海洋, [email protected]
 colinrgodsey   | Colin Godsey, [email protected]
 patriknw       | Patrik Nordwall, [email protected], Lightbend Inc
+-
 +retronym       | Jason Zaugg, [email protected], Lightbend Inc.
 +ldaley         | Luke Daley, [email protected], Gradle Inc.
 +davidmoten     | Dave Moten, [email protected]
 +tomislavhofman | Tomislav Hofman, [email protected]
 +rstoyanchev    | Rossen Stoyanchev, [email protected], VMware
 +ouertani       | Slim Ouertani, [email protected]