Cura/cura/OAuth2
Ghostkeeper 3040fde9eb
Merge branch '4.0'
Conflicts:
	cura/OAuth2/AuthorizationService.py -> Code style change vs. fixing logging in while no internet connection.
2019-02-21 08:25:21 +01:00
..
__init__.py Fix code style and documentation formatting 2019-02-08 11:10:43 +01:00
AuthorizationHelpers.py Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-14 10:53:01 +01:00
AuthorizationRequestHandler.py Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-14 10:53:01 +01:00
AuthorizationRequestServer.py Fix code style and documentation formatting 2019-02-08 11:10:43 +01:00
AuthorizationService.py Merge branch '4.0' 2019-02-21 08:25:21 +01:00
LocalAuthorizationServer.py Fix code style and documentation formatting 2019-02-08 11:10:43 +01:00
Models.py Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-14 10:53:01 +01:00