Commit Graph

1 Commits

Author SHA1 Message Date
Martijn van Berkel (Flitskikker)
96de5df18c Merge branch 'master' into feature/beautify-timecodes-2023
# Conflicts:
#	src/ui/Forms/Options/Settings.Designer.cs
2023-06-06 21:37:03 +02:00