Merge branch 'dev' into feature/ovpn-config-import
This commit is contained in:
commit
ce02d3a829
27 changed files with 218 additions and 340 deletions
|
|
@ -266,8 +266,6 @@ void UiLogic::onGotoCurrentProtocolsPage()
|
|||
emit goToPage(Page::ServerContainers);
|
||||
}
|
||||
|
||||
|
||||
|
||||
//void UiLogic::showEvent(QShowEvent *event)
|
||||
//{
|
||||
//#if defined Q_OS_MACX
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue