Merge commit 130253e (no conflict)

Parent branch: chronotope/main Forked at: aaee912
chronotope · Jul 12, 2020 · 3777c97 · 3777c97
2 parents b4296af + 130253e
commit 3777c97
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -2,9 +2,9 @@ name: lint
 
 on:
   push:
-    branches: [master]
+    branches: [main, master]
   pull_request:
-    branches: [master]
+    branches: [main, master]
 
 jobs:
   lint:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,10 +2,10 @@ name: test
 
 on:
   push:
-    branches: [master]
+    branches: [main, master]
     paths: '**.rs'
   pull_request:
-    branches: [master]
+    branches: [main, master]
     paths: '**.rs'
 
 jobs:

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ which Chrono builds upon and should acknowledge:
 * Luis de Bethencourt's [rust-datetime](https://github.com/luisbg/rust-datetime)
 
 Any significant changes to Chrono are documented in
-the [`CHANGELOG.md`](https://github.com/chronotope/chrono/blob/master/CHANGELOG.md) file.
+the [`CHANGELOG.md`](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md) file.
 
 
 ## Usage

diff --git a/src/lib.rs b/src/lib.rs
@@ -20,7 +20,7 @@
 //! * Luis de Bethencourt's [rust-datetime](https://github.com/luisbg/rust-datetime)
 //!
 //! Any significant changes to Chrono are documented in
-//! the [`CHANGELOG.md`](https://github.com/chronotope/chrono/blob/master/CHANGELOG.md) file.
+//! the [`CHANGELOG.md`](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md) file.
 //!
 //! ## Usage
 //!