Merge pull request #117 from mkurz/rename_main

Rename master branch to main
playframework · Feb 6, 2022 · 159d55b · 159d55b
2 parents d3276eb + 62b0ae1
commit 159d55b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,10 +3,10 @@ name: CI
 on:
   pull_request:
     branches:
-      - master
+      - main
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Netty Reactive Streams
 
-[![Build Status](https://travis-ci.org/playframework/netty-reactive-streams.svg?branch=master)](https://travis-ci.org/playframework/netty-reactive-streams)
+[![Build Status](https://travis-ci.org/playframework/netty-reactive-streams.svg?branch=main)](https://travis-ci.org/playframework/netty-reactive-streams)
 
 This provides a reactive streams implementation for Netty.  Essentially it comes in the form of two channel handlers, one that publishes inbound messages received on a channel to a `Publisher`, and another that writes messages received by a `Subscriber` outbound.
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,10 +3,10 @@ name: CI @@
     on:
       pull_request:
         branches:
-          - master
+          - main
       push:
         branches:
-          - master
+          - main
     jobs:
       build:
@@ Expand Down @@