diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-03-10 20:37:25 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-03-10 20:37:45 +0100 |
| commit | 28a00b768e63d8c9f9f143cc387508f033b1939a (patch) | |
| tree | 157658e2bf50ee2063cafbfba88fc6b011f54210 | |
| parent | fe9ead499365c68dc86c3e90cea3cfe9060314be (diff) | |
| parent | 2cb831e86023881862b9b1f6e105a13b8438ac74 (diff) | |
| download | symfony-security-28a00b768e63d8c9f9f143cc387508f033b1939a.zip symfony-security-28a00b768e63d8c9f9f143cc387508f033b1939a.tar.gz symfony-security-28a00b768e63d8c9f9f143cc387508f033b1939a.tar.bz2 | |
Merge branch '3.0'
* 3.0:
[ci] use hirak/prestissimo
[Filesystem] Fix transient tests
[WebProfiler] Sidebar button padding
Updated some missing READMEs
[HttpFoundation] Avoid warnings when checking malicious IPs
[HttpFoundation] Set the Content-Range header if the requested Range is unsatisfied
| -rw-r--r-- | Guard/README.md | 17 | ||||
| -rw-r--r-- | Http/README.md | 15 |
2 files changed, 5 insertions, 27 deletions
diff --git a/Guard/README.md b/Guard/README.md index 845340f..ce70622 100644 --- a/Guard/README.md +++ b/Guard/README.md @@ -8,15 +8,8 @@ total control. Resources --------- -Documentation: - -https://symfony.com/doc/2.8/book/security.html - -Tests ------ - -You can run the unit tests with the following command: - - $ cd path/to/Symfony/Component/Security/Guard/ - $ composer.phar install --dev - $ phpunit + * [Documentation](https://symfony.com/doc/current/components/security/index.html) + * [Contributing](https://symfony.com/doc/current/contributing/index.html) + * [Report issues](https://github.com/symfony/symfony/issues) and + [send Pull Requests](https://github.com/symfony/symfony/pulls) + in the [main Symfony repository](https://github.com/symfony/symfony) diff --git a/Http/README.md b/Http/README.md index aaacc14..5be2111 100644 --- a/Http/README.md +++ b/Http/README.md @@ -9,23 +9,8 @@ the Java Spring framework. Resources --------- -<<<<<<< HEAD -Documentation: - -https://symfony.com/doc/3.1/book/security.html - -Tests ------ - -You can run the unit tests with the following command: - - $ cd path/to/Symfony/Component/Security/Http/ - $ composer.phar install --dev - $ phpunit -======= * [Documentation](https://symfony.com/doc/current/components/security/index.html) * [Contributing](https://symfony.com/doc/current/contributing/index.html) * [Report issues](https://github.com/symfony/symfony/issues) and [send Pull Requests](https://github.com/symfony/symfony/pulls) in the [main Symfony repository](https://github.com/symfony/symfony) ->>>>>>> 3.0 |