Romain Neutron
|
5d843ab370
|
Merge branch '3.8'
Conflicts:
lib/Alchemy/Phrasea/Border/Manager.php
lib/Alchemy/Phrasea/Controller/Prod/Tools.php
lib/Alchemy/Phrasea/Core/Provider/BorderManagerServiceProvider.php
lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
lib/Alchemy/Phrasea/Helper/User/Manage.php
lib/classes/User/Adapter.php
lib/classes/connection.php
lib/classes/connection/abstract.php
lib/classes/connection/interface.php
lib/classes/connection/pdo.php
lib/classes/patch/370alpha7a.php
lib/classes/patch/370alpha8a.php
lib/classes/record/adapter.php
lib/classes/task/period/RecordMover.php
tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/NativeAuthenticationTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
tests/classes/PhraseanetPHPUnitAbstract.php
|
2014-03-03 00:05:11 +01:00 |
|