2 Commits (bb5639c447e7ddce233983e47cf9b4b3e095cb4b)

Author	SHA1	Message	Date
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	5 years ago
Skylar Ittner	fb25c4395a	Make better API system	5 years ago