mirror/php-rss-bridge
1
0
Fork 0
mirror of https://github.com/RSS-Bridge/rss-bridge.git synced 2025-06-24 20:04:58 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/kranack/rss-bridge

Browse Source 
Conflicts:
	bridges/MondeDiploBridge.php
This commit is contained in:
Damien Calesse
2014-07-24 13:53:24 +02:00
parent c06343128a bf2303ead8
commit ca1314c4ac
3 changed files with 6 additions and 0 deletions

4
bridges/MondeDiploBridge.php

@ -61,3 +61,7 @@ class MondeDiploBridge extends BridgeAbstract{
}
}
<<<<<<< HEAD
=======
>>>>>>> bf2303ead8b6c8aa01a3e1c58ddd27cbc4fc2d71

1
bridges/ScoopItBridge.php

@ -45,3 +45,4 @@ class ScoopItBridge extends BridgeAbstract{
return 21600; // 6 hours
}
}

1
bridges/WhydBridge.php

@ -63,3 +63,4 @@ class WhydBridge extends BridgeAbstract{
}
}