4 commits

Author	SHA1	Message	Date
Daniel Schiavini	a1c252d3a2	Revert "Revert "fix merge conflict"" ... This reverts commit 4bffa6d90f.	2018-12-07 10:25:46 +01:00
Daniel Schiavini	4bffa6d90f	Revert "fix merge conflict" ... This reverts commit ec03b012a7, reversing changes made to 2af33738d1.	2018-12-07 10:22:32 +01:00
Ghostkeeper	a3fe9839ba	Change all uses of 'small' and 'very small' fonts to default ... These two fonts are exactly the same, but I want to use the 'small' font to be something a bit smaller. I'm 'removing' the superfluous font but will be re-using it immediately to look a bit smaller. Contributes to issue CURA-5876.	2018-11-26 17:33:37 +01:00
Ian Paschal	fb3cb67da0	Add printer configuration components ... Contributes to CL-1148	2018-11-20 13:46:41 +01:00