Browse Source

Merge branch 'master' into develop

version-14
mbauskar 8 years ago
parent
commit
8c5656b99d
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -1
      frappe/website/render.py

+ 1
- 1
frappe/__init__.py View File

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template


__version__ = '8.7.4'
__version__ = '8.7.5'
__title__ = "Frappe Framework" __title__ = "Frappe Framework"


local = Local() local = Local()


+ 1
- 1
frappe/website/render.py View File

@@ -80,7 +80,7 @@ def is_static_file(path):
if ('.' not in path): if ('.' not in path):
return False return False
extn = path.rsplit('.', 1)[-1] extn = path.rsplit('.', 1)[-1]
if extn in ('html', 'md', 'js', 'xml'):
if extn in ('html', 'md', 'js', 'xml', 'css'):
return False return False


for app in frappe.get_installed_apps(): for app in frappe.get_installed_apps():


Loading…
Cancel
Save