Permalink
Browse files

Merge branch '2.3' into 2.4

* 2.3:
  update year on licenses
  rundown and typo fix
  [Process] Fix #9861 : Revert TTY mode
  [Form] Update minimal requirement in composer.json
  Fix Empty translations with Qt files
  Update UPGRADE-2.3.md to account for #9388

Conflicts:
	src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
  • Loading branch information...
2 parents b3c3b5a + 65c1e73 commit 7e65abb06d3b38f4be89266fe3fb4a759544e713 @fabpot fabpot committed Jan 7, 2014
Showing with 1 addition and 1 deletion.
  1. +1 −1 LICENSE
View
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2013 Fabien Potencier
+Copyright (c) 2004-2014 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

0 comments on commit 7e65abb

Please sign in to comment.