Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' of git://github.com/zendframework/zf2
Browse files Browse the repository at this point in the history 
Fixed files permissions
  • Loading branch information
Grzegorz Drozd committed Feb 28, 2013
58 parents 890dac8 + 9c6ae8b + 41bae99 + 31bfa24 + fcce046 + 8c90899 + 30f09d5 + 3ad1a91 + 963afc1 + dcb5579 + 5a70cb8 + 94fa516 + 5a71444 + 49365ef + d28861e + 41968e8 + 8a45737 + 82e2294 + d1eaeea + 2afbcec + 5dfb440 + 1f739e2 + 4f070ba + 3d5cfdd + b356e78 + 5d5db68 + aac5906 + 6b42daa + b71ca62 + 13a8c46 + e2e3049 + 948dece + 1ad9981 + c7059f6 + d780a75 + f83d5da + ca7499b + dc8e4d3 + f5d9438 + 5f3f514 + 29054de + b171f7a + c3d35f9 + e234c68 + 4a8aa4e + 047312a + 5990a86 + 36bd80d + 858f608 + 6c48039 + a898eab + 8c7837e + 5e0dc98 + 88eed41 + 025b9cd + b09399b + 40fb121 + 7112e67 commit 024254d
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 18 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
"dev-master": "2.1-dev",
"dev-develop": "2.2-dev"
}
},
"autoload-dev": {
Expand Down
3 changes: 0 additions & 3 deletions src/Escaper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Escaper
*/

namespace Zend\Escaper;
Expand All @@ -14,8 +13,6 @@

/**
* Context specific methods for use in secure output escaping
*
* @package Zend_Escaper
*/
class Escaper
{
Expand Down
5 changes: 0 additions & 5 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Escaper
*/

namespace Zend\Escaper\Exception;

/**
* @category Zend
* @package Zend_Escaper
*/
interface ExceptionInterface
{}
4 changes: 0 additions & 4 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Escaper
*/

namespace Zend\Escaper\Exception;

/**
* Invalid argument exception
*
* @category Zend
* @package Zend_Escaper
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Escaper
*/

namespace Zend\Escaper\Exception;

/**
* Invalid argument exception
*
* @category Zend
* @package Zend_Escaper
*/
class RuntimeException extends \RuntimeException implements
ExceptionInterface
Expand Down

0 comments on commit 024254d

Please sign in to comment.