4 commits

Author	SHA1	Message	Date
michael shanks	f633c59aca	merge conflicts..	2019-08-28 22:10:26 +01:00
michael shanks	83dd49bc9a	button conflict...	2019-08-28 22:05:24 +01:00
michael shanks	ea3e847290	working on standard component	2019-08-27 07:32:56 +01:00
michael shanks	573f274f89	component preview sort of working	2019-08-19 21:18:23 +01:00