c23e8c6 Merge branch 'master' into f26

Merged and Committed by luhliarik 6 years ago
1 file changed. 6 lines added. 2 lines removed.
    Merge branch 'master' into f26
    
        
file modified
+6 -2