Merge branch 'ticket-14904-achatexpressmobile' of

git@gitlab.antadis.net:dev-antadis/bebeboutik.git into
ticket-14904-achatexpressmobile

Conflicts:
	themes/site_mobile/css/style.css
This commit is contained in:
Michael RICOIS 2018-01-19 11:23:26 +01:00
commit f010de6d2d

View File

@ -5363,6 +5363,9 @@ body#order-detail table#order-product tbody tr.item tr.title span.quantity{
position: absolute;
bottom: 12px;
border-radius: 20px;
<<<<<<< HEAD
right: 0;
=======
>>>>>>> branch 'ticket-14904-achatexpressmobile' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git
z-index: 10000;
}