Skip to content

Commit

Permalink
Merge branch '2.3' into 2.6
Browse files Browse the repository at this point in the history 
* 2.3:
  Changed PhpStormOpener to PhpStormProtocol
  [#5402] Being explicit what this applies to (it should not apply to things like >=)
  [Contributing] [Conventions] Added entry for Yoda conditions
  Document security.switch_user event
  Added some more docs about the remember me feature
  Fixed a minor grammar issue
  Fixed a minor grammar issue
  Added support for standard Forwarded header
  Added support for standard Forwarded header
  Fixed issues reported by @xabbuh
  Remove the Propel book chapter and explain why we do that
  • Loading branch information
@weaverryan
weaverryan committed Jun 28, 2015
2 parents 5c064e7 + 89479f6 commit 6d3d892
Show file tree
Hide file tree
Showing 6 changed files with 134 additions and 549 deletions.
Loading

0 comments on commit 6d3d892

Please sign in to comment.