wildkif 636fc4f9b3 Merge remote-tracking branch 'origin/frontend' into frontend ... # Conflicts: # src/gui/qt-daemon/html/main.js # src/gui/qt-daemon/html/main.js.map		2019-05-07 12:09:01 +03:00
..
qt-daemon	Merge remote-tracking branch 'origin/frontend' into frontend	2019-05-07 12:09:01 +03:00