diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-28 08:30:16 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-28 08:30:16 -0500 |
| commit | f12dc1cd0fd5fee70c15cb2f72f23ac9478dacf3 (patch) | |
| tree | a4fa02f5dc522b9c756656fc2f841c592b152ab0 /config.py | |
| parent | 75f55a60348bc107652945b3ffcada40236bdc62 (diff) | |
| parent | 63b5cbc5757ce0487ed1d557c491b46079add64e (diff) | |
| download | anonbib-f12dc1cd0fd5fee70c15cb2f72f23ac9478dacf3.tar.gz | |
Merge remote-tracking branch 'hopper/master'
Conflicts:
anonbib.bib
Diffstat (limited to 'config.py')
| -rw-r--r-- | config.py | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -10,7 +10,7 @@ _KEYS = [ "ALL_TAGS", "DOWNLOAD_CONNECT_TIMEOUT","INITIAL_STRINGS", "MASTER_BIB", "NO_COLLAPSE_AUTHORS", "OMIT_ENTRIES", "OUTPUT_DIR", "TEMPLATE_FILE", "BIBTEX_TEMPLATE_FILE", - "REQUIRE_KEY", "TAG_TITLES", "TAG_DIRECTORIES", "TAG_SHORT_TITLES", + "REQUIRE_KEY", "TAG_TITLES", "TAG_DIRECTORIES", "TAG_SHORT_TITLES", "MULTI_VAL_FIELDS" ] for _k in _KEYS: @@ -54,3 +54,4 @@ AUTHOR_RE_LIST = [] NO_COLLAPSE_AUTHORS_RE_LIST = [] ALPHABETIZE_AUTHOR_AS_RE_LIST = [] + |