Merging other languages

This commit is contained in:
James Miranda
2016-09-23 18:03:39 -03:00
parent fa439f692f
commit feda733afc
2 changed files with 6 additions and 1 deletions

View File

@@ -11,5 +11,9 @@
7. [Network programming with Go](http://jan.newmarch.name/go/)
8. [setup-the-rails-application-for-internationalization](http://guides.rubyonrails.org/i18n.html#setup-the-rails-application-for-internationalization)
9. [The Cross-Site Scripting (XSS) FAQ](http://www.cgisecurity.com/xss-faq.html)
<<<<<<< fa439f692f31fa3d054eac849ea958f29c613b6e
10. [Network programming with Go](http://jan.newmarch.name/go)
11. [RESTFul](http://www.ruanyifeng.com/blog/2011/09/restful.html)
=======
10. [Network programming with Go](http://jan.newmarch.name/go)
>>>>>>> fix #378