Merge remote-tracking branch 'origin/master'

jiangjiu · Jul 13, 2016 · 8150f54 · 8150f54
2 parents 1816a69 + f9ace77
commit 8150f54
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -11,6 +11,8 @@
 - [vuex 状态管理](https://github.com/vuejs/vuex)
 - [vue-router 路由](https://github.com/vuejs/vue-router)
 - [vue-resource xhr请求](https://github.com/vuejs/vue-resource)
+- [marked 语法解析](https://github.com/chjj/marked)
+- [prismjs 代码高亮](http://prismjs.com/)
 
 
 ### 后端