Skip to content

Commit ac111ca

Browse files
Merge branch '3.0'
* 3.0: (28 commits) [Console] Fix an autocompletion question helper issue with non-sequentially indexed choices [Process] Fix pipes handling [Finder] Partially revert #17134 to fix a regression Mentioned the deprecation of deep parameters in UPGRADE files [HttpKernel] Fix mem usage when stripping the prod container [Filesystem] Fix false positive in ->remove() [Filesystem] Cleanup/sync with 2.3 [Validator] Fix the locale validator so it treats a locale alias as a valid locale [HttpFoundation] Fix transient test [HttpFoundation] Add a dependency on the mbstring polyfill [2.7] update readme files for new components add readme files where missing [2.8] update readme files for new components fix lowest TwigBridge deps versions reference form type by name on Symfony 2.7 [EventDispatcher] fix syntax error Don't use reflections when possible Don't use reflections when possible [Form] Update form tests after the ICU data update [Intl] Update tests and the number formatter to match behaviour of the intl extension ... Conflicts: src/Symfony/Component/Ldap/README.md src/Symfony/Component/Security/Core/README.md src/Symfony/Component/Security/Csrf/README.md src/Symfony/Component/Security/Http/README.md
2 parents 79aa825 + 10c937c commit ac111ca

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ the Java Spring framework.
99
Resources
1010
---------
1111

12+
<<<<<<< HEAD
1213
Documentation:
1314

1415
https://symfony.com/doc/3.1/book/security.html
@@ -21,3 +22,10 @@ You can run the unit tests with the following command:
2122
$ cd path/to/Symfony/Component/Security/Http/
2223
$ composer.phar install --dev
2324
$ phpunit
25+
=======
26+
* [Documentation](https://symfony.com/doc/current/components/security/index.html)
27+
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
28+
* [Report issues](https://github.com/symfony/symfony/issues) and
29+
[send Pull Requests](https://github.com/symfony/symfony/pulls)
30+
in the [main Symfony repository](https://github.com/symfony/symfony)
31+
>>>>>>> 3.0

0 commit comments

Comments
 (0)