Merge branch 'dev' of git.kde.org:ocs-webserver into dev
19f19cc57b7a
Actions

Authored by david nelband <dnelband@gmail.com> on Dec 11 2018, 2:30 PM.

Description

Merge branch 'dev' of git.kde.org:ocs-webserver into dev

Committed

david nelband <dnelband@gmail.com>

Dec 11 2018, 2:30 PM

Parents

R767:b291399e7414: no message
R767:863c8cdf35f7: startpage

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	863c8cdf35f7			siyuandong	startpage	Dec 11 2018
	4d8ae7daba9d			siyuandong	startpage	Dec 11 2018

				Path	Packages
	M			application/modules/default/controllers/HomeController.php
	P			application/modules/default/views/scripts/home/index-opendesktop-test.phtml Copied from application/modules/default/views/scripts/home/index-opendesktop.phtml