Nicolas Le Goff 45c3e564df Fix PR ...

Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	templates/web/prod/Share/record.html.twig

2012-10-18 15:45:52 +02:00

..

Api.php

Remove user variable assignment

2012-10-04 15:44:49 +02:00

ApiVersion.php

Disable cookie session in API

2012-10-04 15:43:36 +02:00

Lightbox.php

Add firewall to lightbox

2012-10-04 15:48:05 +02:00

OAuth2.php

Remove get_registry method

2012-10-04 15:44:49 +02:00

Root.php

Fix PR

2012-10-18 15:45:52 +02:00

Setup.php

Update setup application

2012-10-04 15:44:51 +02:00