[MERGE] from trunk

bzr revid: xmo@openerp.com-20131007085750-hkv4fgeph0cc65eb
This commit is contained in:
Xavier Morel
2013-10-07 10:57:50 +02:00
78 changed files with 167 additions and 1272 deletions
+1
View File
@@ -330,6 +330,7 @@ table.editorbar-panel td.selected {
color: white;
height: 48px;
margin-bottom: 32px;
padding-top: 12px;
}
/* ---- SNIPPET MANIPULATOR ---- */