danog/phpseclib
1
0
Fork 0
mirror of https://github.com/danog/phpseclib.git synced 2024-11-30 04:39:21 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into php5

Browse Source 
* master:
  Update squizlabs/php_codesniffer from 1.5.2 to 1.5.5
  Update phpunit/phpunit to 4.3.*
  Update sami/sami to 2.*

Conflicts:
	composer.lock
This commit is contained in:
Andreas Fischer 2014-12-02 21:41:01 +01:00
commit 885359bf21
2 changed files with 380 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -50,8 +50,8 @@
},
"require-dev": {
"phing/phing": "2.7.*",
"phpunit/phpunit": "4.0.*",
"sami/sami": "1.*",
"phpunit/phpunit": "4.3.*",
"sami/sami": "2.*",
"squizlabs/php_codesniffer": "1.*"
},
"suggest": {

655
composer.lock generated
View File

File diff suppressed because it is too large Load Diff