Merge branch 'main' into prerelease

# Conflicts:
#	Application/FeedCenter.csproj
#	Application/Properties/Resources.resx
This commit is contained in:
2025-09-25 12:53:39 -04:00
11 changed files with 40 additions and 6 deletions

View File

@@ -612,4 +612,7 @@ All feeds currently in category "{0}" will be moved to the default category.</va
<data name="AccountTypeGoogleReader" xml:space="preserve">
<value>Google Reader</value>
</data>
<data name="includePrereleaseCheckBox" xml:space="preserve">
<value>Include _prerelease</value>
</data>
</root>