Skip to content

Commit

Permalink
Merge 98b60bd into d6f20ba
Browse files Browse the repository at this point in the history
  • Loading branch information
AddisonSchiller committed Oct 25, 2017
2 parents d6f20ba + 98b60bd commit d7b808b
Show file tree
Hide file tree
Showing 5 changed files with 618 additions and 1 deletion.
1 change: 1 addition & 0 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ Contributors
- Rafael de Lucena Valle `@rafaeldelucena <https://github.com/rafaeldelucena>`_
- Matthew Keitelman `@zamattiac <https://github.com/zamattiac>`_
- John Tordoff `@Johnetordoff <https://github.com/Johnetordoff>`_
- Addison Schiller `@AddisonSchiller <https://github.com/AddisonSchiller>`_
1 change: 1 addition & 0 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ In general
- `PEP 8`_, when sensible.
- Test ruthlessly. Write docs for new features.
- Even more important than Test-Driven Development--*Human-Driven Development*.
- If you add an extension to setup.py, add it to supportedextensions.md.
- Please update AUTHORS.rst when you contribute.

.. _`PEP 8`: http://www.python.org/dev/peps/pep-0008/
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def parse_requirements(requirements):
'.fan = mfr.extensions.codepygments:CodePygmentsRenderer',
'.fancypack = mfr.extensions.codepygments:CodePygmentsRenderer',
'.fas = mfr.extensions.codepygments:CodePygmentsRenderer',
'.fasta= mfr.extensions.codepygments:CodePygmentsRenderer',
'.fasta = mfr.extensions.codepygments:CodePygmentsRenderer',
'.feature = mfr.extensions.codepygments:CodePygmentsRenderer',
'.fhtml = mfr.extensions.codepygments:CodePygmentsRenderer',
'.flx = mfr.extensions.codepygments:CodePygmentsRenderer',
Expand Down

0 comments on commit d7b808b

Please sign in to comment.