Darren/dpaste
1
0
Fork 0
mirror of https://github.com/DarrenOfficial/dpaste.git synced 2024-11-15 16:12:51 +11:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Martin Mahner 2016-06-04 07:02:12 +00:00
commit c07c45dc31
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dpaste/highlight.py
View file

@ -79,6 +79,7 @@ LEXER_LIST = getattr(settings, 'DPASTE_LEXER_LIST', (
('properties', 'Properties'), ('properties', 'Properties'),
('puppet', 'Puppet'), ('puppet', 'Puppet'),
('python', 'Python'), ('python', 'Python'),
('r', 'R'),
('rb', 'Ruby'), ('rb', 'Ruby'),
('rst', 'reStructuredText'), ('rst', 'reStructuredText'),
('rust', 'Rust'), ('rust', 'Rust'),

1
dpaste/settings/base.py
View file

@ -104,6 +104,7 @@ TEMPLATES = [
'context_processors': [ 'context_processors': [
'django.template.context_processors.debug', 'django.template.context_processors.debug',
'django.template.context_processors.request', 'django.template.context_processors.request',
'django.template.context_processors.i18n',
], ],
}, },
}, },