diff options
| author | Daniel Mueller <deso@posteo.net> | 2018-12-17 19:40:59 -0800 |
|---|---|---|
| committer | Daniel Mueller <deso@posteo.net> | 2018-12-17 19:40:59 -0800 |
| commit | 74d9302eeddc0c9aadd9a8d6ebcb786d55a91320 (patch) | |
| tree | 71efc0f8ce89dbe2eb2271f04e044e541c1f1e9e | |
| parent | 14f6e9070ec2c1d4dad6afe32928133eaa0f3f67 (diff) | |
| download | nitrocli-74d9302eeddc0c9aadd9a8d6ebcb786d55a91320.tar.gz nitrocli-74d9302eeddc0c9aadd9a8d6ebcb786d55a91320.tar.bz2 | |
Migrate work to the 'master' branch
In the past we have used the 'devel' branch for more or less early
development work that includes the occasional rebase to fix up mistakes
and keep the history clean. That is a non-starter when it comes to
tagging signed releases, which we have introduced recently.
Hence, there is no point in diverging from what the rest of the world is
doing by using a branch name other than 'master' as the main development
vehicle.
By now we have introduced two dependencies on the branch name into the
code base, which this change fixes up.
| -rw-r--r-- | nitrocli/Cargo.toml | 2 | ||||
| -rw-r--r-- | nitrocli/README.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nitrocli/Cargo.toml b/nitrocli/Cargo.toml index 0c9f0f4..68b3b80 100644 --- a/nitrocli/Cargo.toml +++ b/nitrocli/Cargo.toml @@ -33,7 +33,7 @@ A command line tool for interacting with the Nitrokey Storage device. """ [badges] -gitlab = { repository = "d-e-s-o/nitrocli", branch = "devel" } +gitlab = { repository = "d-e-s-o/nitrocli", branch = "master" } [dependencies.nitrokey] version = "0.2.1" diff --git a/nitrocli/README.md b/nitrocli/README.md index d22ee71..7e721e8 100644 --- a/nitrocli/README.md +++ b/nitrocli/README.md @@ -1,4 +1,4 @@ -[](https://gitlab.com/d-e-s-o/nitrocli/commits/devel) +[](https://gitlab.com/d-e-s-o/nitrocli/commits/master) [](https://crates.io/crates/nitrocli) [](https://blog.rust-lang.org/2018/12/06/Rust-1.31-and-rust-2018.html) |