Commit Graph

2 Commits (a89c663ca93489e8b1ddcb8a4ab8b5ad4b0c18c9)

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
6 years ago
Skylar Ittner 39ccaa2f2d Add RSS/ATOM notification feeds, close #12 6 years ago