Merge branch 'master' into docs

This commit is contained in:
Wyatt Johnson
2018-02-22 15:40:06 -07:00
98 changed files with 1324 additions and 969 deletions
+2
View File
@@ -29,6 +29,7 @@ plugins.json
plugins/*
!plugins/talk-plugin-akismet
!plugins/talk-plugin-facebook-auth
!plugins/talk-plugin-google-auth
!plugins/talk-plugin-auth
!plugins/talk-plugin-respect
!plugins/talk-plugin-offtopic
@@ -56,6 +57,7 @@ plugins/*
!plugins/talk-plugin-subscriber
!plugins/talk-plugin-flag-details
!plugins/talk-plugin-slack-notifications
!plugins/talk-plugin-profile-settings
**/node_modules/*
yarn-error.log