mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-11-29 08:40:12 +01:00
Fixed conflicts when merging 'master' into 'rss'
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -113,6 +113,7 @@ tests/download_test
|
||||
tests/getpids_test
|
||||
tests/log_unlink_test
|
||||
tests/mcast_recv_test
|
||||
tests/metadata_wildcard_test
|
||||
tests/notification_test
|
||||
tests/rdxml_parse_test
|
||||
tests/readcd_test
|
||||
|
||||
Reference in New Issue
Block a user