Skylar Ittner f2d3c199ab Merge BusinessAppTemplate ...

# Conflicts:
#	composer.lock
#	lang/en_us.php
#	lib/login.php
#	mobile/index.php

2018-09-07 18:29:25 -06:00

..

index.php

Merge BusinessAppTemplate

2018-09-07 18:29:25 -06:00