Jonathan White
aae6d09fd3
Merge branch 'master' into develop
Conflicts:
src/CMakeLists.txt
src/autotype/xcb/AutoTypeXCB.cpp
src/browser/BrowserAction.cpp
src/browser/BrowserService.cpp
src/browser/BrowserService.h
src/browser/BrowserSettings.h
src/browser/NativeMessagingHost.cpp
src/browser/NativeMessagingHost.h
src/gui/EditWidgetIcons.cpp
src/gui/EditWidgetIcons.h
src/gui/MainWindow.cpp
src/proxy/NativeMessagingHost.cpp
tests/TestOpenSSHKey.cpp
2018-05-07 23:24:30 -04:00
..
2018-03-31 16:01:30 -04:00
2018-03-31 16:01:30 -04:00
2018-03-31 16:01:30 -04:00
2018-03-31 16:01:30 -04:00
2018-01-21 15:54:46 +01:00
2018-03-31 16:01:30 -04:00
2018-02-04 15:59:08 +02:00
2017-11-19 14:38:59 +02:00
2018-03-31 16:01:30 -04:00
2018-03-31 16:01:30 -04:00
2018-03-17 11:03:36 +01:00
2018-03-17 11:03:36 +01:00
2018-02-04 15:59:08 +02:00
2018-03-31 16:01:30 -04:00
2018-03-31 16:01:30 -04:00
2018-03-31 16:01:30 -04:00
2018-05-07 23:24:30 -04:00
2018-03-31 16:01:30 -04:00
2018-03-31 16:01:30 -04:00
2018-03-31 16:01:30 -04:00