Commit 7e849771 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Elimina recursos de bloqueo

See merge request redmic-project/gateway/nginx-proxy-https!18
parents b22f4192 a8ceae2e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment