Merge branch 'release/v3.6.1'

SamAmco · Jul 12, 2023 · c54e654 · c54e654
2 parents 9fbdcbb + 03112af
commit c54e654
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -40,8 +40,8 @@ android {
         applicationId "com.samco.trackandgraph"
         minSdkVersion 23
         targetSdkVersion 33
-        versionCode 300600
-        versionName "3.6.0"
+        versionCode 300601
+        versionName "3.6.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         vectorDrawables {

diff --git a/base/src/main/res/values/strings.xml b/base/src/main/res/values/strings.xml
@@ -272,8 +272,8 @@
     <string name="data_point_tutorial_page_3_description">Use labels if you want to group the data points</string>
     <string name="data_point_tutorial_page_3_hint">(Hint: If you want to add more context or description use the note instead of the label field)</string>
     <string name="help">Help</string>
-    <string name="faq_page_link" translatable="false">https://github.com/SamAmco/track-and-graph/blob/release/v3.6.0/docs/faq/index.md#faq</string>
-    <string name="faq_page_link_1" translatable="false">https://github.com/SamAmco/track-and-graph/blob/release/v3.6.0/docs/faq/faq_1.md#how-do-i-start-tracking-something</string>
+    <string name="faq_page_link" translatable="false">https://github.com/SamAmco/track-and-graph/blob/release/v3.6.1/docs/faq/index.md#faq</string>
+    <string name="faq_page_link_1" translatable="false">https://github.com/SamAmco/track-and-graph/blob/release/v3.6.1/docs/faq/faq_1.md#how-do-i-start-tracking-something</string>
     <string name="advanced_options">Advanced options</string>
     <string name="type_colon">"Type: "</string>
     <string name="order_colon">"Order: "</string>

diff --git a/fastlane/metadata/android/en-GB/changelogs/300601.txt b/fastlane/metadata/android/en-GB/changelogs/300601.txt
@@ -0,0 +1,3 @@
+- Fix bug tracker widget data point input dialog crashing
+
+