Skip to content

Commit

Permalink
Merge branch 'PHPCAS-126'
Browse files Browse the repository at this point in the history 
Conflicts:
	source/CAS.php
	source/CAS/Client.php
  • Loading branch information
@adamfranco
adamfranco committed Oct 26, 2011
2 parents c751274 + 790cae5 commit 56762f3
Show file tree
Hide file tree
Showing 2 changed files with 295 additions and 325 deletions.

0 comments on commit 56762f3

Please sign in to comment.