merge master into v7.0 for v7.1.0
[osm/NBI.git] / osm_nbi / http /
drwxr-xr-x   ..
-rw-r--r-- 1415 cert.pem
-rw-r--r-- 1679 privkey.pem