Commit bf6cf48488aa8b9449a90f706ce9dfd81609460c
Exists in
master
Merge branch 'fix-static-settings'
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
colab/settings.py
| @@ -81,7 +81,7 @@ USE_TZ = True | @@ -81,7 +81,7 @@ USE_TZ = True | ||
| 81 | # Static files (CSS, JavaScript, Images) | 81 | # Static files (CSS, JavaScript, Images) |
| 82 | # https://docs.djangoproject.com/en/1.7/howto/static-files/ | 82 | # https://docs.djangoproject.com/en/1.7/howto/static-files/ |
| 83 | 83 | ||
| 84 | -STATIC_ROOT = '/var/lib/colab/static/' | 84 | +STATIC_ROOT = '/var/lib/colab/assets/static/' |
| 85 | STATIC_URL = '/static/' | 85 | STATIC_URL = '/static/' |
| 86 | 86 | ||
| 87 | STATICFILES_STORAGE = \ | 87 | STATICFILES_STORAGE = \ |
setup.py
| @@ -42,7 +42,7 @@ EXCLUDE_FROM_PACKAGES = [] | @@ -42,7 +42,7 @@ EXCLUDE_FROM_PACKAGES = [] | ||
| 42 | 42 | ||
| 43 | setup( | 43 | setup( |
| 44 | name='colab', | 44 | name='colab', |
| 45 | - version='1.12.1', | 45 | + version='1.12.2', |
| 46 | url='https://github.com/colab-community/colab', | 46 | url='https://github.com/colab-community/colab', |
| 47 | author='Sergio Oliveira', | 47 | author='Sergio Oliveira', |
| 48 | author_email='sergio@tracy.com.br', | 48 | author_email='sergio@tracy.com.br', |