Skylar Ittner f1f682780c Merge BusinessAppTemplate ...

# Conflicts:
#	.gitignore
#	README.md
#	action.php
#	api.php
#	app.php
#	composer.json
#	composer.lock
#	index.php
#	langs/en/core.json
#	langs/en/titles.json
#	langs/messages.php
#	lib/Exceptions.lib.php
#	lib/Login.lib.php
#	lib/Notifications.lib.php
#	lib/Strings.lib.php
#	lib/User.lib.php
#	mobile/index.php
#	nbproject/project.properties
#	nbproject/project.xml
#	pages.php
#	pages/home.php
#	required.php
#	settings.template.php
#	static/css/bootstrap.min.css
#	static/img/logo.svg
#	static/js/app.js

2018-12-02 13:51:27 -07:00

..

app.js

Merge BusinessAppTemplate

2018-12-02 13:51:27 -07:00

bootstrap.bundle.min.js

Update Bootstrap and FontAwesome

2018-09-21 16:38:34 -06:00

fontawesome-all.min.js

Update Bootstrap and FontAwesome

2018-09-21 16:36:29 -06:00

jquery-3.3.1.min.js

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

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