Commit Graph

4 Commits (0593f4c6d45f67245fb5d19fa9306d6daa3dcea9)

Author SHA1 Message Date
Skylar Ittner 0593f4c6d4 Merge ssh://source.netsyms.com:2322/Business/BusinessAppTemplate
# Conflicts:
#	.gitignore
#	README.md
#	action.php
#	api.php
#	app.php
#	composer.json
#	composer.lock
#	index.php
#	lang/en_us.php
#	lang/messages.php
#	lib/login.php
#	lib/userinfo.php
#	mobile/index.php
#	nbproject/project.properties
#	nbproject/project.xml
#	pages.php
#	pages/404.php
#	pages/home.php
#	required.php
#	settings.template.php
#	static/css/app.css
#	static/img/logo.png
#	static/img/logo.svg
#	static/js/app.js
6 years ago
Skylar Ittner 623c5e2f01 Fully implement MPL-2.0 license 7 years ago
Skylar Ittner 66269b6221 Branding++ 7 years ago
Skylar Ittner 0b811feccb Add api.php 7 years ago