Master bug fixes#2

Merged

jared-mackey merged 13 commits intomasterfrom

master_bug_fixes

Sep 19, 2016

Commits on Aug 25, 2016

Merge branch 'master' into master
dimitri-justeau
authored
Fix empty doctstring for viewsets when docstring is only defined at class-level
dimitri-justeau
committed
Merge branch 'master' of github.com:dimitri-justeau/django-rest-framework-docs
dimitri-justeau
committed

Commits on Sep 19, 2016

Update docs

manosim
authored and
Jared Mackey
committed
Minor Changes

manosim
authored and
Jared Mackey
committed
Adding in MarkDown support. Original contributed here https://github.com/manosim/django-rest-framework-docs/pull/127
Jared Mackey
committed
updated gitignore for pycharm
Jared Mackey
committed
Allow json header. Originally contributed at https://github.com/manosim/django-rest-framework-docs/pull/126/commits/089f75418be439ed8d8b7359a5a901805cf13618
Jared Mackey
committed