upstream merge

This commit is contained in:
Burhan Khalid 2015-11-16 14:20:19 +03:00
parent 5079db3a4a
commit 9920c6d5b9

View File

@ -32,14 +32,20 @@ Features
* Grunt build for compass and livereload
* Basic e-mail configurations for sending emails via Mailgun_
* Media storage using Amazon S3
* Serve static files from Amazon S3 or Whitenoise_ (optional)
* Pre configured Celery_ (optional)
* Integration with Maildump_ for local email testing (optional)
* Integration with Sentry_ for error logging (optional)
* Integration with NewRelic_ for performance monitoring (optional)
* Docker support using docker-compose_ for dev and prod
* Docker support using docker-compose_ for development and production
* Procfile_ for deploying to Heroku
Optional Integrations
---------------------
*These features can be enabled during initial project setup.*
* Serve static files from Amazon S3 or Whitenoise_
* Configuration for Celery_
* Integration with Maildump_ for local email testing
* Integration with Sentry_ for error logging
* Integration with NewRelic_ for performance monitoring
.. _alpha: http://blog.getbootstrap.com/2015/08/19/bootstrap-4-alpha/
.. _Hitch: https://github.com/hitchtest/hitchtest
.. _Bootstrap: https://github.com/twbs/bootstrap