Commit Graph

7 Commits (master)

Author SHA1 Message Date
Skylar Ittner c99b739532 Merge ssh://source.netsyms.com:2322/Business/BusinessAppTemplate
# Conflicts:
#	.gitignore
#	LICENSE.md
#	README.md
#	api.php
#	app.php
#	composer.json
#	composer.lock
#	lang/en_us.php
#	lib/login.php
#	lib/userinfo.php
#	mobile/index.php
#	pages.php
#	pages/404.php
#	required.php
#	settings.template.php
#	static/css/app.css
#	static/img/logo.png
#	static/js/app.js
6 years ago
Skylar Ittner d193f3df4a Update license 6 years ago
Skylar Ittner a41eea4cff Implement MPL-2.0 license 6 years ago
Skylar Ittner 11a00263c4 Update license 7 years ago
Skylar Ittner 80c79155e6 Update LICENSE.md 7 years ago
Skylar Ittner 9248fa2154 Update LICENSE.md 7 years ago
Skylar Ittner 24bd46db26 LICENSE -> LICENSE.md 7 years ago