Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6

This commit is contained in:
Nicolas Le Goff
2012-02-29 13:33:17 +01:00
22 changed files with 13191 additions and 12510 deletions

View File

@@ -1592,8 +1592,7 @@ BOITES MODALES
#sbasfiltercont
{
color:#FFFFFF;
padding:10px;
margin:10px;
margin: 0 0 0 10px;
}
#adv_search .sbasglob div hr
{

View File

@@ -1596,8 +1596,7 @@ BOITES MODALES
#sbasfiltercont
{
color:#FFFFFF;
padding:10px;
margin:10px;
margin: 0 0 0 10px;
}
#adv_search .sbasglob div hr
{