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

..

Api

Merge branch '3.8'

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

Exception

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Account.php

Merge branch 'replace_users' of https://github.com/nlegoff/Phraseanet into nlegoff-replace_users

2014-02-20 18:02:27 +01:00

AccountSettings.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Api.php

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

Element.php

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

Exception.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00