Romain Neutron c641ab7841 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

2014-02-28 19:37:54 +01:00

..

mobile

Address PR comments

2014-02-19 17:29:27 +01:00

web

Merge branch '3.8'

2014-02-28 19:37:54 +01:00