[MERGE] merge from rma branch
bzr revid: ged@openerp.com-20140417134752-0yfhhv4zilp9e002
This commit is contained in:
commit
372e640bb2
|
@ -207,6 +207,9 @@
|
|||
.fa-star:before {
|
||||
content: "\f005";
|
||||
}
|
||||
. fa-tasks:before {
|
||||
content: "\f0ae";
|
||||
}
|
||||
.fa-star-o:before {
|
||||
content: "\f006";
|
||||
}
|
||||
|
@ -237,6 +240,12 @@
|
|||
.fa-search-minus:before {
|
||||
content: "\f010";
|
||||
}
|
||||
.fa-adn:before {
|
||||
content: "\f170";
|
||||
}
|
||||
. fa-times:before {
|
||||
content: "\f00d";
|
||||
}
|
||||
.fa-power-off:before {
|
||||
content: "\f011";
|
||||
}
|
||||
|
@ -308,6 +317,9 @@
|
|||
.fa-qrcode:before {
|
||||
content: "\f029";
|
||||
}
|
||||
.fa-calendar:before {
|
||||
content: "\f073";
|
||||
}
|
||||
.fa-barcode:before {
|
||||
content: "\f02a";
|
||||
}
|
||||
|
@ -759,6 +771,9 @@
|
|||
.fa-pinterest:before {
|
||||
content: "\f0d2";
|
||||
}
|
||||
.fa-pencil-square-o:before {
|
||||
content: "\f044";
|
||||
}
|
||||
.fa-pinterest-square:before {
|
||||
content: "\f0d3";
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue