FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Finish merge of mac-release.

This commit is contained in:
Maurice Parker 2020-03-01 16:33:05 -08:00
parent 94c6ca428f
commit 5755dd0844
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -69,13 +69,7 @@ fastlane/Preview.html
fastlane/screenshots fastlane/screenshots
fastlane/test_output fastlane/test_output
<<<<<<< HEAD
/Shared/Secrets.swift /Shared/Secrets.swift
*.py[cod] *.py[cod]
=======
/Shared/Secrets.swift
*.py[cod]
>>>>>>> mac-release

1
Shared/Article Rendering/ArticleRenderer.swift
View File

@ -264,6 +264,5 @@ private extension Article {
} }
return url return url
} }
} }