Merge origin/master

Conflicts: WebDesktop.jar

Merge origin/master
Conflicts: WebDesktop.jar
b1ad2494 · Marco Antonio Carvalho · bf06b0c8 · 1572195a · b1ad2494 · b1ad2494
Commit b1ad2494 authored Oct 29, 2018 by Marco Antonio Carvalho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 0 deletions

AppLauncher.exe AppLauncher.exe +0 -0

AppUpdateManager.jar AppUpdateManager.jar +0 -0

WebDesktop.jar WebDesktop.jar +0 -0

No files found.
--- a/AppLauncher.exe
+++ b/AppLauncher.exe
--- a/AppUpdateManager.jar
+++ b/AppUpdateManager.jar
--- a/WebDesktop.jar
+++ b/WebDesktop.jar