Merge branch '3.8'

Conflicts:
	lib/classes/Bridge/Api/Dailymotion.php
	lib/classes/Bridge/Api/Flickr.php
	lib/classes/Bridge/Api/Interface.php
	lib/classes/DailymotionWithoutOauth2.php
This commit is contained in:
Romain Neutron
2014-02-28 19:37:54 +01:00
10 changed files with 25 additions and 21 deletions

View File

@@ -9,6 +9,7 @@
* file that was distributed with this source code.
*/
use Symfony\Component\Routing\Generator\UrlGenerator;
use Symfony\Component\HttpFoundation\Request;
interface Bridge_Api_Interface