Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 3cc8b90

Browse files
committed
Merge branch '2.2' into 2.3
* 2.2: Remove +x mode on file updated doc links updated VENDORS for 2.1.10 Conflicts: README.md
2 parents 9d6f396 + 884ee2e commit 3cc8b90

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,16 @@ released under the MIT or BSD license.
156156

157157
Enjoy!
158158

159-
[1]: http://symfony.com/doc/2.1/book/installation.html
159+
[1]: http://symfony.com/doc/2.2/book/installation.html
160160
[2]: http://getcomposer.org/
161161
[3]: http://symfony.com/download
162-
[4]: http://symfony.com/doc/2.1/quick_tour/the_big_picture.html
163-
[5]: http://symfony.com/doc/2.1/index.html
164-
[6]: http://symfony.com/doc/2.1/bundles/SensioFrameworkExtraBundle/index.html
165-
[7]: http://symfony.com/doc/2.1/book/doctrine.html
166-
[8]: http://symfony.com/doc/2.1/book/templating.html
167-
[9]: http://symfony.com/doc/2.1/book/security.html
168-
[10]: http://symfony.com/doc/2.1/cookbook/email.html
169-
[11]: http://symfony.com/doc/2.1/cookbook/logging/monolog.html
170-
[12]: http://symfony.com/doc/2.1/cookbook/assetic/asset_management.html
171-
[13]: http://symfony.com/doc/2.1/bundles/SensioGeneratorBundle/index.html
162+
[4]: http://symfony.com/doc/2.2/quick_tour/the_big_picture.html
163+
[5]: http://symfony.com/doc/2.2/index.html
164+
[6]: http://symfony.com/doc/2.2/bundles/SensioFrameworkExtraBundle/index.html
165+
[7]: http://symfony.com/doc/2.2/book/doctrine.html
166+
[8]: http://symfony.com/doc/2.2/book/templating.html
167+
[9]: http://symfony.com/doc/2.2/book/security.html
168+
[10]: http://symfony.com/doc/2.2/cookbook/email.html
169+
[11]: http://symfony.com/doc/2.2/cookbook/logging/monolog.html
170+
[12]: http://symfony.com/doc/2.2/cookbook/assetic/asset_management.html
171+
[13]: http://symfony.com/doc/2.2/bundles/SensioGeneratorBundle/index.html

app/logs/.gitkeep

100755100644
File mode changed.

0 commit comments

Comments
 (0)