83f1d8f Merge fix for Opera Addons

Merged and Committed by Libor Polčák 3 years ago
    Merge fix for Opera Addons
    
     Conflicts:
    	.gitignore
    
        
file modified
+4 -2
file modified
+4 -2
file modified
+2 -2