Skylar Ittner 59136bd8eb Merge ../BusinessAppTemplate ...

# Conflicts:
#	README.md
#	action.php
#	api/functions.php
#	lib/User.lib.php
#	mobile/index.php
#	pages/form.php
#	settings.template.php
#	static/js/form.js

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

..

actions

Check for apppass option in login api

2019-02-11 16:10:09 -07:00

.htaccess

Make better API system, use new AccountHub API

2018-12-14 21:16:31 -07:00

apisettings.php

Check for apppass option in login api

2019-02-11 16:10:09 -07:00

functions.php

Merge ../BusinessAppTemplate

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

index.php

Merge ../BusinessAppTemplate

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