Merge branch '3.0'

This commit is contained in:
Mark 2017-09-28 13:01:10 +02:00
commit b4154b8cc0
205 changed files with 367 additions and 863 deletions

View file

@ -1,5 +1,5 @@
# Copyright (c) 2017 Ultimaker B.V.
# PluginBrowser is released under the terms of the AGPLv3 or higher.
# PluginBrowser is released under the terms of the LGPLv3 or higher.
from UM.Extension import Extension
from UM.i18n import i18nCatalog
from UM.Logger import Logger

View file

@ -1,5 +1,5 @@
# Copyright (c) 2017 Ultimaker B.V.
# PluginBrowser is released under the terms of the AGPLv3 or higher.
# PluginBrowser is released under the terms of the LGPLv3 or higher.
from . import PluginBrowser