Merge branch 'Falkon/3.1'
fbe4ec6ddbbb
Actions

Authored by drosca on Mar 20 2019, 12:25 PM.

Description

Merge branch 'Falkon/3.1'

Committed

drosca

Mar 20 2019, 12:25 PM

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	067155d53af5			drosca	NetworkManager: Fix QtWebEngine warning about registering schemes	Mar 20 2019
	797e4c12a261			drosca	QML Plugins: Fix exporting i18n functions	Mar 20 2019

				Path	Packages
	M			CMakeLists.txt
	M			src/lib/app/mainapplication.cpp
	M			src/lib/network/networkmanager.cpp
	M			src/lib/network/networkmanager.h
	M			src/lib/plugins/qml/qmlpluginloader.cpp