Merge remote-tracking branch 'remotes/origin/master' into json-mixin

This commit is contained in:
David Lord 2017-06-04 09:42:19 -07:00
commit dbc70c9274
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
135 changed files with 5600 additions and 2991 deletions

View file

@ -22,6 +22,7 @@ Patches and Suggestions
- Florent Xicluna
- Georg Brandl
- Jeff Widman @jeffwidman
- Joshua Bronson @jab
- Justin Quick
- Kenneth Reitz
- Keyan Pishdadian