Romain Neutron 432252f5f8 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/User/Adapter.php
	lib/classes/eventsmanager/broker.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/uploadquarantine.php
	lib/classes/eventsmanager/notify/validationdone.php
	templates/web/admin/index.html.twig

2013-11-12 19:19:13 +01:00

..

320alpha1a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

320alpha1b.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

320alpha2a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

320alpha3a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

320alpha4a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

320alpha4b.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

320alpha5a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

320alpha6a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

320alpha8a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

360alpha1a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

360alpha1b.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

360alpha2a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

360alpha2b.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

361alpha1a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

370alpha1a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

370alpha3a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

370alpha4a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

370alpha5a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

370alpha6a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

370alpha7a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

370alpha8a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

370alpha9a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

371alpha1a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

373alpha1a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

379alpha1a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha2a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha2b.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha3a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha3b.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha4a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

380alpha6a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha8a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha9a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha10a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha11a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

380alpha13a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha14a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha15a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha16a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha17a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

380alpha18a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

381alpha1a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

381alpha1b.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00

381alpha2a.php

Fix #1579 : Update old geonames server address

2013-11-08 11:52:43 +01:00

381alpha3a.php

Fix #1571 : Cleanup user settings, fix user settings calls

2013-11-12 15:16:54 +01:00

390alpha1a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

390alpha1b.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

390alpha2a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

390alpha3a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

390alpha4a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

390alpha5a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

390alpha6a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

390alpha7a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

390alpha8a.php

Merge branch '3.8'

2013-11-08 19:04:26 +01:00

3715alpha1a.php

Fix patch naming mess

2013-11-07 17:49:39 +01:00