Skylar Ittner 063c8398a9 Merge ../BusinessAppTemplate ...

# Conflicts:
#	README.md
#	langs/en/titles.json
#	pages.php
#	required.php
#	settings.template.php

2019-03-19 19:01:17 -06:00

..

css

Merge ../BusinessAppTemplate

2019-03-19 19:01:17 -06:00

fonts

Add basic page editing and saving in control panel

2018-04-23 00:36:52 -06:00

img

Add placeholder "No Image" image in editor

2018-05-16 15:52:26 -06:00

js

Merge ../BusinessAppTemplate

2019-03-19 19:01:17 -06:00