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

..

custom

Added some empty dirs

2011-12-07 18:10:57 +01:00

include

Remove dev dependencies from package tasks

2014-02-27 19:23:59 +01:00

scripts

Remove dev dependencies from package tasks

2014-02-27 19:23:59 +01:00

skins

Merge branch '3.8'

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

.htaccess

Revert apache htaccess

2013-05-24 16:27:23 +02:00

api.php

Bump copyright year

2014-01-06 15:28:12 +01:00

crossdomain.xml

V 3.5 RC 1

2011-12-05 00:23:28 +01:00

favicon.ico

initial import

2011-02-16 16:09:48 +01:00

index_dev.php

Bump copyright year

2014-01-06 15:28:12 +01:00

index.php

Bump copyright year

2014-01-06 15:28:12 +01:00