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

..

en

Merge ../BusinessAppTemplate

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

messages.php

Merge BusinessAppTemplate

2018-09-24 00:52:13 -06:00