Nicolas Le Goff 0688a9f58a Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6

2012-01-04 17:55:16 +01:00

..

admin

Merge 3.5.7

2012-01-03 15:26:07 +01:00

api/auth

V 3.5 RC 1

2011-12-05 00:23:28 +01:00

common

Fix templates

2011-12-29 18:25:43 +01:00

geonames

V 3.5 RC 1

2011-12-05 00:23:28 +01:00

lightbox

Fix templates

2011-12-29 18:25:43 +01:00

login

fix cooliris feed issue & fix rss tests

2011-12-29 18:45:26 +01:00

prod

Merge with master

2012-01-04 16:24:47 +01:00

report

fix #153 No display of thumbs in report

2012-01-04 15:15:47 +01:00

setup

merge

2012-01-04 17:04:15 +01:00

upload

V 3.5 RC 1

2011-12-05 00:23:28 +01:00

overview.twig

V 3.5 RC 1

2011-12-05 00:23:28 +01:00

test.html

V 3.5 RC 1

2011-12-05 00:23:28 +01:00