Skip to content
Snippets Groups Projects
Commit 0eed076c authored by Armin Felder's avatar Armin Felder
Browse files

Merge branch 'master' into 'fixRcserverDestructor' 

# Conflicts:
#   rocketchatserver.cpp
parents 273dcbd0 339aa048
No related branches found
No related tags found
1 merge request!23removed destructor from rocketchatserver
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net