Merge branch 'master' into bug-killing-spree

This commit is contained in:
Kiwi
2017-06-21 01:37:46 +07:00
committed by GitHub
2 changed files with 12 additions and 2 deletions
+11 -1
View File
@@ -7,7 +7,17 @@ endpoint when the server is running with built assets.
## Contributing to Talk
See our [Contribution Guide](https://github.com/coralproject/talk/blob/master/CONTRIBUTING.md)!
See our [Contribution Guide](https://github.com/coralproject/talk/blob/master/CONTRIBUTING.md).
## Documentation
### General
See our [Talk Documentation & Guides](https://coralproject.github.io/talk/index.html).
### Plugins
See our guide to using and building [Talk Plugins](https://github.com/coralproject/talk/blob/master/PLUGINS.md).
## Usage
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "talk",
"version": "2.0.1",
"version": "2.1.0",
"description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
"main": "app.js",
"scripts": {