Auto stash before merge of "master" and "master/master"

This commit is contained in:
Manuel de Brito Fontes 2017-10-20 22:38:27 -03:00
parent 004ddbcd2f
commit 6537ff3ebf
7 changed files with 8 additions and 8 deletions

View file

@ -1,5 +1,5 @@
nginx 1.13.x base image using [ubuntu-slim](https://github.com/kubernetes/ingress/tree/master/images/ubuntu-slim)
nginx 1.13.x base image using [ubuntu-slim](https://github.com/kubernetes/ingress-nginx/tree/master/images/ubuntu-slim)
nginx [engine x] is an HTTP and reverse proxy server, a mail proxy server, and a generic TCP proxy server.