commit 6f2e47c27f1271a0bdcbb6a456ce0d9edd814994
parent ddcd0385c0cc69b889eb79b5d55c961186440788
Author: Frederic Cambus <fred@statdns.com>
Date: Sun, 4 Jun 2017 12:23:47 +0200
Merge pull request #11 from m1q/master
add NGINX Conference 2016 Videos talks
Diffstat:
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/README.md b/README.md
@@ -125,6 +125,7 @@ This list is maintained by [Frederic Cambus](https://www.cambus.net). For update
## Talks
+- [NGINX Conference 2016 Videos](https://www.youtube.com/playlist?list=PLGz_X9w9raXcOsB_dT26iu0BvbSxWYG1g)
- [NGINX Conference 2015 Videos](https://www.youtube.com/playlist?list=PLGz_X9w9raXdED9BR6GQ61A6d3fBzjpbn)
- [NGINX Conference 2014 Videos](https://www.youtube.com/playlist?list=PLGz_X9w9raXewvc6tjIGGFZ6DBKHEld3k)
- [NGINX Conference](https://www.nginx.com/nginxconf/)