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

..

material-color @ 7f2e7a8caf

Fix setup.php

2018-07-23 20:08:04 -06:00

app.css

Rewrite a lot of code, close Business/CommonBugs#3, close Business/CommonBugs#4, close #9

2018-07-11 23:32:47 -06:00

bootstrap.min.css

Fix bootstrap font URL

2018-09-25 13:07:54 -06:00

dock.css

Improve app dock/bar

2018-07-23 21:11:20 -06:00

index.css

Rewrite a lot of code, close Business/CommonBugs#3, close Business/CommonBugs#4, close #9

2018-07-11 23:32:47 -06:00

qrcode.css

Rewrite a lot of code, close Business/CommonBugs#3, close Business/CommonBugs#4, close #9

2018-07-11 23:32:47 -06:00

svg-with-js.min.css

Update FontAwesome from 5.3.1 to 5.6.0

2018-12-11 21:39:25 -07:00