Romain Neutron e0c1f600dd Merge branch '3.8' ...

Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Doctrine/Repositories/SessionRepository.php
	lib/classes/User/Adapter.php

2013-12-03 21:32:46 +01:00

..

Adapter.php

Merge branch '3.8'

2013-12-03 21:32:46 +01:00

Interface.php

Remove license comments

2013-11-20 16:49:29 +01:00

Query.php

Merge pull request #799 from romainneutron/code-comments

2013-11-20 10:05:22 -08:00

QueryInterface.php

Remove license comments

2013-11-20 16:49:29 +01:00