Laurent Destailleur 37f5922bf8 Fix conflict

2020-01-27 01:38:50 +01:00

..

images

…

colorbox.css

…

phone.css

Phone layout and functional improvements

2019-10-16 16:26:00 +02:00

pos.css

Fix conflict

2020-01-27 01:38:50 +01:00