Merge branch 'master' into release/2.1.0

# Conflicts: # UnityPomodoro/Assets/AdrianMiasik/Scripts/PomodoroTimer.cs
adrian-miasik · Mar 30, 2022 · 9f465c6 · 9f465c6
2 parents 3f0bb8f + 5c61744
commit 9f465c6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/UnityPomodoro/Assets/AdrianMiasik/Scripts/PomodoroTimer.cs b/UnityPomodoro/Assets/AdrianMiasik/Scripts/PomodoroTimer.cs
@@ -1591,4 +1591,4 @@ public void ShowTickAnimation()
             m_digitFormat.ShowTickAnimation();
         }
     }
-}
+}