Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: aizatto/symfony
base: eb66dc7245
...
head fork: aizatto/symfony
compare: 1402f3a527
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
2  app/bootstrap.php.cache
@@ -456,7 +456,7 @@ abstract class Kernel implements KernelInterface
protected $startTime;
protected $classes;
- const VERSION = '2.0.10';
+ const VERSION = '2.0.11';
public function __construct($environment, $debug)
View
2  bin/vendors
@@ -138,7 +138,7 @@ foreach ($deps as $name => $dep) {
if ('update' === $command || 'lock' === $command) {
echo '> Updating deps.lock'.PHP_EOL;
- file_put_contents($rootDir.'/deps.lock', implode("\n", $newversions));
+ file_put_contents($rootDir.'/deps.lock', implode("\n", $newversions)."\n");
}
// php on windows can't use the shebang line from system()
View
2  deps
@@ -1,6 +1,6 @@
[symfony]
git=http://github.com/symfony/symfony.git
- version=v2.0.10
+ version=v2.0.11
[twig]
git=http://github.com/fabpot/Twig.git
View
4 deps.lock
@@ -1,4 +1,4 @@
-symfony v2.0.10
+symfony v2.0.11
twig v1.6.0
monolog 1.0.2
doctrine-common 2.1.4
@@ -12,4 +12,4 @@ SensioFrameworkExtraBundle 638f545b7020b9e9d5944a7e3167f60ed848250d
JMSSecurityExtraBundle 541a4c242328dc04b99540c75346cc74a7c0cfb5
SensioDistributionBundle 20b66a408084ad8752f98e50f10533f5245310bf
SensioGeneratorBundle dd37fc4487bc09ac01bdcf89e0ff4ee4484b7fab
-AsseticBundle v1.0.1
+AsseticBundle v1.0.1
View
2  src/Acme/DemoBundle/Resources/views/Welcome/index.html.twig
@@ -19,7 +19,7 @@
{% if app.environment == 'dev' %}
<div class="block-configure">
<div class="illustration">
- <img src="{{ asset('bundles/acmedemo/images/welcome-configure.gif') }}" alt="Configure your appication" />
+ <img src="{{ asset('bundles/acmedemo/images/welcome-configure.gif') }}" alt="Configure your application" />
</div>
<a class="symfony-button-green" href="{{ path('_configurator_home') }}">Configure</a>
</div>
2  vendor/symfony
@@ -1 +1 @@
-Subproject commit 7f97b60d50031e4f1beb9a1a10c32dac816584cf
+Subproject commit 2d4fb8ad502a80af475c7232b5497571ed32a641

No commit comments for this range

Something went wrong with that request. Please try again.