Skip to content

Commit 298f1cb

Browse files
committed
Merge branch 'feature/supported-filetype-docs' into develop
[SVCS-525] Closes: #283
2 parents 868b794 + 28e72b7 commit 298f1cb

File tree

5 files changed

+625
-1
lines changed

5 files changed

+625
-1
lines changed

AUTHORS.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ Contributors
3030
- Rafael de Lucena Valle `@rafaeldelucena <https://github.com/rafaeldelucena>`_
3131
- Matthew Keitelman `@zamattiac <https://github.com/zamattiac>`_
3232
- John Tordoff `@Johnetordoff <https://github.com/Johnetordoff>`_
33+
- Addison Schiller `@AddisonSchiller <https://github.com/AddisonSchiller>`_

CONTRIBUTING.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ In general
88
- `PEP 8`_, when sensible.
99
- Test ruthlessly. Write docs for new features.
1010
- Even more important than Test-Driven Development--*Human-Driven Development*.
11+
- If you add an extension to setup.py, add it to supportedextensions.md.
1112
- Please update AUTHORS.rst when you contribute.
1213

1314
.. _`PEP 8`: http://www.python.org/dev/peps/pep-0008/

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def parse_requirements(requirements):
278278
'.fan = mfr.extensions.codepygments:CodePygmentsRenderer',
279279
'.fancypack = mfr.extensions.codepygments:CodePygmentsRenderer',
280280
'.fas = mfr.extensions.codepygments:CodePygmentsRenderer',
281-
'.fasta= mfr.extensions.codepygments:CodePygmentsRenderer',
281+
'.fasta = mfr.extensions.codepygments:CodePygmentsRenderer',
282282
'.feature = mfr.extensions.codepygments:CodePygmentsRenderer',
283283
'.fhtml = mfr.extensions.codepygments:CodePygmentsRenderer',
284284
'.flx = mfr.extensions.codepygments:CodePygmentsRenderer',

0 commit comments

Comments
 (0)