blallo/rss-bridge
1
0
Fork 1
Code Issues Pull requests 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
commit ca1314c4ac
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bridges/MondeDiploBridge.php
View file

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

1
bridges/ScoopItBridge.php
View file

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

1
bridges/WhydBridge.php
View file

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