10 Commits

Author	SHA1	Message	Date
Romain Neutron	4e64f9a1a2	Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6	2012-01-18 14:24:57 +01:00
Romain Neutron	1f77d5ec48	Refactor include_pathes	2012-01-18 10:37:00 +01:00
Nicolas Le Goff	bbbe292e04	Merge with 3.6	2012-01-17 18:00:34 +01:00
Romain Neutron	aecb273b96	Set include pathes to real path	2012-01-17 16:56:38 +01:00
Nicolas Le Goff	c0c33d9e35	modify datas for bridge	2012-01-17 16:44:12 +01:00
Romain Neutron	3d32dcd2ce	Merge	2012-01-11 21:06:33 +01:00
Romain Neutron	f3a45274b9	Syntax Corrections	2012-01-11 20:04:47 +01:00
Nicolas Le Goff	a15542748e	fix testes	2012-01-11 16:27:20 +01:00
Nicolas Le Goff	4c265a61bb	fix bridge testes	2011-12-30 00:32:17 +01:00
Romain Neutron	4c5b7eb658	V 3.5 RC 1	2011-12-05 00:23:28 +01:00