Merge branch 'dev' into feature/ovpn-config-import

This commit is contained in:
pokamest 2022-12-12 14:01:57 +01:00
commit ce02d3a829
27 changed files with 218 additions and 340 deletions

View file

@ -266,8 +266,6 @@ void UiLogic::onGotoCurrentProtocolsPage()
emit goToPage(Page::ServerContainers);
}
//void UiLogic::showEvent(QShowEvent *event)
//{
//#if defined Q_OS_MACX