Romain Neutron bfe5da79d2 Merge branch '3.8' ...

Conflicts:
	lib/classes/User/Adapter.php
	lib/conf.d/bases_structure.xml

2013-12-20 09:53:09 +01:00

..

Adapter.php

Merge branch '3.8'

2013-12-20 09:53:09 +01:00

Interface.php

Remove license comments

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

Query.php

Merge branch '3.8'

2013-12-18 12:12:58 +01:00

QueryInterface.php

Remove license comments

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