Merge pull request #17 from teamreflex/develop

Merging Develop into Master
discord-php · Feb 15, 2016 · 0b5e263 · 0b5e263
2 parents ace22c0 + b52f0f3
commit 0b5e263
Show file tree

Hide file tree

Showing 20 changed files with 611 additions and 3,609 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/docs/Makefile b/docs/Makefile