4 commits

Author	SHA1	Message	Date
bill bittner	149af453f4	resolved merge conflicts	2018-06-07 13:46:17 -07:00
bill bittner	58660b0a20	fixed publish preview columns	2018-06-02 20:58:54 -07:00
bill bittner	57c14f10af	moved show pages to pages folder	2018-05-31 17:06:00 -07:00
bill bittner	6931c37f83	updated pages to use PageLayout and moved show pages	2018-05-31 16:39:35 -07:00