Romain Neutron 4c29ea5a7a Merge branch 'replace_users' of https://github.com/nlegoff/Phraseanet into nlegoff-replace_users ...

Conflicts:
	lib/classes/ACL.php
	lib/classes/User/Adapter.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/report/add.php
	lib/classes/module/report/edit.php
	lib/classes/module/report/push.php
	lib/classes/module/report/sent.php
	lib/classes/module/report/validate.php
	lib/classes/record/preview.php

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

..

Application

Bump copyright year

2014-01-06 15:40:56 +01:00

Exception

Merge branch '3.8'

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

Form

Merge branch '3.8'

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

Account.php

Use Short Array notation

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

Adapter.php

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

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

Application.php

Fix CS

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

AuthCode.php

Merge branch '3.8'

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

RefreshToken.php

Merge branch '3.8'

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

Token.php

Merge branch '3.8'

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