Skip to content

Commit

Permalink
Merge branch 'master' into newline-config
Browse files Browse the repository at this point in the history
  • Loading branch information
Matan Kushner committed Jul 25, 2019
2 parents 367024c + 95ce43e commit 71329c3
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
30 changes: 15 additions & 15 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ maintenance = { status = "actively-developed" }
clap = "2.33.0"
ansi_term = "0.12.0"
dirs = "2.0.1"
git2 = "0.9.1"
git2 = "0.9.2"
toml = "0.5.1"
serde_json = "1.0.40"
rayon = "1.1.0"
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ISC License

Copyright (c) 2019, Matan Kushner <hello@matchai.me>
Copyright (c) 2019, Starship Contributors

Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,5 +135,5 @@ This project follows the [all-contributors](https://github.com/all-contributors/

## 📝 License

Copyright © 2019-present, [Matan Kushner](https://github.com/matchai).<br>
Copyright © 2019-present, [Starship Contributors](https://github.com/starship/starship/graphs/contributors).<br>
This project is [ISC](./LICENSE) licensed.
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ home: true
heroImage: /logo.svg
actionText: Get Started →
actionLink: /guide/
footer: ISC Licensed | Copyright © 2019-present Matan Kushner
footer: ISC Licensed | Copyright © 2019-present Starship Contributors
---

<div class="features">
Expand Down

0 comments on commit 71329c3

Please sign in to comment.