Skip to content

Commit

Permalink
Merge pull request #152 from Ilhasoft/develop
Browse files Browse the repository at this point in the history
Version 1.12.1
  • Loading branch information
Douglas Paz committed Jul 4, 2018
2 parents 6a1667e + c60507c commit 57f1f8d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ You can set environment variables in your OS, write on ```.env``` file or pass v
| DEFAULT_DATABASE | ```string``` | ```sqlite:///db.sqlite3``` | Read [dj-database-url](https://github.com/kennethreitz/dj-database-url) to configure the database connection.
| LANGUAGE_CODE | ```string``` | ```en-us``` | A string representing the language code for this installation.This should be in standard [language ID format](https://docs.djangoproject.com/en/2.0/topics/i18n/#term-language-code).
| TIME_ZONE | ```string``` | ```UTC``` | A string representing the time zone for this installation. See the [list of time zones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones).
| STATIC_URL | ```string``` | ```/static/``` | URL to use when referring to static files located in ```STATIC_ROOT```.
| EMAIL_HOST | ```string``` | ```None``` | The host to use for sending email. When setted to ```None``` and ```DEBUG``` is ```True```, the ```EMAIL_BACKEND``` setting is setted to ```django.core.mail.backends.console.EmailBackend```
| EMAIL_PORT | ```int``` | ```25``` | Port to use for the SMTP server defined in ```EMAIL_HOST```.
| DEFAULT_FROM_EMAIL | ```string``` | ```webmaster@localhost``` | Default email address to use for various automated correspondence from the site manager(s).
Expand Down
2 changes: 1 addition & 1 deletion bothub/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@

# Static files (CSS, JavaScript, Images)

STATIC_URL = '/static/'
STATIC_URL = config('STATIC_URL', default='/static/')

STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

setup(
name='bothub',
version='1.12.0',
version='1.12.1',
description='bothub',
packages=find_packages(),
install_requires=[
Expand Down

0 comments on commit 57f1f8d

Please sign in to comment.