From: Dan Brown <redacted>
Date: Sat, 10 Mar 2018 17:45:16 +0000 (+0000)
Subject: Merge pull request #711 from duncanbarnes/master
X-Git-Tag: v0.20.1~1^2~27^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/c44c42103c9e1aa324ce706b4acb8e5076af9610?hp=-c

Merge pull request #711 from duncanbarnes/master

Added ability to configure email sender name
---

c44c42103c9e1aa324ce706b4acb8e5076af9610
diff --combined .env.example
index 54badeb7c,088507b28..ccafaf4fb
--- a/.env.example
+++ b/.env.example
@@@ -20,8 -20,6 +20,8 @@@ SESSION_DRIVER=fil
  #CACHE_DRIVER=memcached
  #SESSION_DRIVER=memcached
  QUEUE_DRIVER=sync
 +# A different prefix is useful when multiple BookStack instances use the same caching server
 +CACHE_PREFIX=bookstack
  
  # Memcached settings
  # If using a UNIX socket path for the host, set the port to 0
@@@ -75,3 -73,5 +75,5 @@@ MAIL_PORT=102
  MAIL_USERNAME=null
  MAIL_PASSWORD=null
  MAIL_ENCRYPTION=null
+ MAIL_FROM=null
+ MAIL_FROM_NAME=null