Merge pull request #235.
authorJoshua Roesslein <jroesslein@gmail.com>
Fri, 27 Dec 2013 18:14:39 +0000 (12:14 -0600)
committerJoshua Roesslein <jroesslein@gmail.com>
Fri, 27 Dec 2013 18:14:39 +0000 (12:14 -0600)
Conflicts:
tweepy/api.py

1  2 
tweepy/api.py

diff --cc tweepy/api.py
index 0d4ccccb2664e34409491b2c2ddff17b40f684dd,9c83a54c7217b1cc0ec86e3c521f8ee982ab7fa5..e0d955e4c8d50e6d398d6747a3f264efc5627aa6
@@@ -682,11 -759,11 +682,17 @@@ class API(object)
          allowed_param = ['lat', 'long', 'name', 'contained_within']
      )
  
 +    """ help/languages.json """
 +    supported_languages = bind_api(
 +        path = '/help/languages.json',
 +        payload_type = 'json',
 +        require_auth = True
++
+     """help/configuration"""
+     configuration = bind_api(
+         path = '/help/configuration.json',
+         payload_type = 'json',
+         require_auth = True,
      )
  
      """ Internal use only """