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

..

core.json

Nicer access denied message

2018-12-27 00:15:27 -07:00

index.json

Nicer access denied message

2018-12-27 00:15:27 -07:00

strings.json

Merge ../BusinessAppTemplate

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

titles.json

Add FormBuilder

2018-12-20 23:24:47 -07:00