Merge branch 'master' into add-support-report_spam-perform_block-param
authorHarmon <Harmon758@gmail.com>
Thu, 25 Apr 2019 21:30:36 +0000 (16:30 -0500)
committerGitHub <noreply@github.com>
Thu, 25 Apr 2019 21:30:36 +0000 (16:30 -0500)
1  2 
docs/api.rst
tweepy/api.py

diff --cc docs/api.rst
Simple merge
diff --cc tweepy/api.py
index d20be2d5ca7e05b48824c7142f35a22a374856a4,baf0d541faccc639ad3102d9ae69199aac2aa126..32bc48f1f3e4bab36fad50daa65ef27f49c4f614
@@@ -867,8 -866,8 +866,8 @@@ class API(object)
  
      @property
      def report_spam(self):
-         """ :reference: https://dev.twitter.com/rest/reference/post/users/report_spam
+         """ :reference: https://developer.twitter.com/en/docs/accounts-and-users/mute-block-report-users/api-reference/post-users-report_spam
 -            :allowed_param:'user_id', 'screen_name'
 +            :allowed_param:'user_id', 'screen_name', 'perform_block'
          """
          return bind_api(
              api=self,