Skip to content

S
Silex
Commit a19bf3ee authored by Fabien Potencier's avatar Fabien Potencier
Browse files
Options

Merge branch '1.2' 

* 1.2:
  Add option to disable memory spool

Conflicts:
	src/Silex/Provider/SwiftmailerServiceProvider.php
parents 5a959d67 bbb63a5d
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment