Merge branch 'master' into dev

This commit is contained in:
Feng Lee 2015-05-03 22:36:10 +08:00
commit 01ab65dbc4
1 changed files with 1 additions and 1 deletions

View File

@ -75,7 +75,7 @@ cd emqttd && make && make dist
## GetStarted ## GetStarted
Read [Get Started](https://github.com/emqtt/emqttd/wiki/Get-Started) for more installation and configuration guide. Read [emqtt wiki](https://github.com/emqtt/emqttd/wiki) for detaied installation and configuration guide.
## Benchmark ## Benchmark