From ae6bd937a99f9df4e915b2832bea9fbb5a7e575e Mon Sep 17 00:00:00 2001 From: Sylvia van Os Date: Tue, 6 Dec 2022 19:33:04 +0100 Subject: [PATCH] Move to main --- CONTRIBUTING.md | 2 +- .../protect/card_locker/AboutActivity.java | 2 +- docs/README.md | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7fc58758e..e693396cd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -100,5 +100,5 @@ your real name, saying: Finally, you will need to submit your patches so that they can be reviewed and potentially merged into the main Catima repository. The preferred way to do this is to submit a Pull Request to the Catima project. -Changes need to apply cleanly onto the master branch and pass all +Changes need to apply cleanly onto the main branch and pass all unit tests and produce no errors during static analysis. diff --git a/app/src/main/java/protect/card_locker/AboutActivity.java b/app/src/main/java/protect/card_locker/AboutActivity.java index 867b4c6bb..f7adc5dac 100644 --- a/app/src/main/java/protect/card_locker/AboutActivity.java +++ b/app/src/main/java/protect/card_locker/AboutActivity.java @@ -34,7 +34,7 @@ public class AboutActivity extends CatimaAppCompatActivity { binding.versionHistory.setTag("https://catima.app/changelog/"); binding.translate.setTag("https://hosted.weblate.org/engage/catima/"); - binding.license.setTag("https://github.com/CatimaLoyalty/Android/blob/master/LICENSE"); + binding.license.setTag("https://github.com/CatimaLoyalty/Android/blob/main/LICENSE"); binding.repo.setTag("https://github.com/CatimaLoyalty/Android/"); binding.privacy.setTag("https://catima.app/privacy-policy/"); binding.reportError.setTag("https://github.com/CatimaLoyalty/Android/issues"); diff --git a/docs/README.md b/docs/README.md index 7a8c215a4..de6f5db54 100644 --- a/docs/README.md +++ b/docs/README.md @@ -18,7 +18,7 @@ Copylefted libre software (GPLv3+) card management app. Get it on Google Play -![Logo](https://github.com/TheLastProject/Catima/raw/master/app/src/main/ic_launcher-playstore.png) +![Logo](https://github.com/TheLastProject/Catima/raw/main/app/src/main/ic_launcher-playstore.png) *Logo by [Rose (TangentFoxy)](http://github.com/TangentFoxy)* @@ -42,14 +42,14 @@ Supported barcodes: # Screenshots -[](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png) -[](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png) -[](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png) -[](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png) -[](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png) -[](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png) -[](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png) -[](https://github.com/TheLastProject/Catima/raw/master/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png) +[](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-01.png) +[](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-02.png) +[](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-03.png) +[](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-04.png) +[](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-05.png) +[](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-06.png) +[](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-07.png) +[](https://github.com/TheLastProject/Catima/raw/main/fastlane/metadata/android/en-US/images/phoneScreenshots/screenshot-08.png) # Moving data from other apps