aa2dd42 Merge commit '2155615a6c2749a836dd5fcc5a5d4cd27899560b' into epel7

Merged and Committed by orion 4 years ago
    Merge commit '2155615a6c2749a836dd5fcc5a5d4cd27899560b' into epel7
    
    Conflicts:
    	python-rfc3986.spec
    
        
file modified
+2 -0
file modified
+79 -9
file modified
+1 -1