Skylar Ittner e1837a22fe Merge ../BusinessAppTemplate ...

# Conflicts:
#	README.md
#	api.php
#	index.php
#	langs/en/core.json
#	langs/en/titles.json
#	mobile/index.php
#	required.php
#	settings.template.php

2019-01-04 17:57:08 -07:00

..

en

Merge ../BusinessAppTemplate

2019-01-04 17:57:08 -07:00

messages.php

Merge ../BusinessAppTemplate

2019-01-04 17:57:08 -07:00