friendica/library/oauth2-php/lib
Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
..
OAuth2.inc Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
OAuth2Client.inc Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
OAuth2Exception.inc Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00