Skylar Ittner bb5639c447 Merge BusinessAppTemplate (new settings.php format) ...

# Conflicts:
#	api.php
#	api/apisettings.php
#	api/index.php
#	app.php
#	index.php
#	langs/en/titles.json
#	lib/Login.lib.php
#	lib/Notifications.lib.php
#	lib/User.lib.php
#	mobile/index.php
#	required.php
#	settings.template.php

2018-12-21 01:16:29 -07:00

..

index.php

Merge BusinessAppTemplate (new settings.php format)

2018-12-21 01:16:29 -07:00