Skip to content
This repository has been archived by the owner on Sep 6, 2019. It is now read-only.

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
sergei-maertens committed Apr 11, 2016
2 parents bfc1d1e + a3bf3ac commit b83caf9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion systemjs/__init__.py
Expand Up @@ -7,7 +7,7 @@
import subprocess


VERSION = (1, 3, 0, 'final', 0)
VERSION = (1, 3, 1, 'final', 0)


default_app_config = 'systemjs.apps.SystemJSConfig'
Expand Down
4 changes: 1 addition & 3 deletions systemjs/finders.py
@@ -1,7 +1,5 @@
from __future__ import unicode_literals

import os

from django.contrib.staticfiles.finders import BaseStorageFinder

from .storage import JSPMFileStorage
Expand All @@ -21,7 +19,7 @@ def find(self, path, all=False):
# TODO: figure out the 'jspm_packages' dir from packag.json.
"""
bits = os.path.split(path)
bits = path.split('/')
if not bits or bits[0] != 'jspm_packages':
return []
return super(SystemFinder, self).find(path, all=all)
Expand Down

0 comments on commit b83caf9

Please sign in to comment.