octoleo/phpseclib
1
0
Fork 0
mirror of https://github.com/phpseclib/phpseclib.git synced 2024-06-07 19:10:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0' into 2.0

Browse Source 
* 1.0:
  Composer: add GrahamCampbell to composer.json
  AUTHORS: add GrahamCampbell

Conflicts:
	composer.lock
This commit is contained in:
Andreas Fischer 2015-09-16 13:31:01 +02:00
commit cb0f1a57e6
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -3,3 +3,4 @@ phpseclib Lead Developer: TerraFrost (Jim Wigginton)
phpseclib Developers: monnerat (Patrick Monnerat)
bantu (Andreas Fischer)
petrich (Hans-Jürgen Petrich)
GrahamCampbell (Graham Campbell)

5
composer.json
View File

@ -43,6 +43,11 @@
"name": "Hans-Jürgen Petrich",
"email": "petrich@tronic-media.com",
"role": "Developer"
},
{
"name": "Graham Campbell",
"email": "graham@alt-three.com",
"role": "Developer"
}
],
"require": {

2
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "3c1701cdae74c93eba5311e59f11cdb6",
"hash": "7faf707048f74c867bd2fc2857d35fa0",
"packages": [],
"packages-dev": [
{