jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
friendica/library
History
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
..
cropper Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
fancybox Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
fullcalendar
HTML5 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
HTMLPurifier Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
jgrowl Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
mcefixes Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
oauth2-php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
phpsec Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
simplepie Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
spam finalise spam storage model, begin driver changes. 2012-03-05 23:20:42 -08:00
tinymce translate br with extra elements 2012-03-26 16:56:44 -07:00
tiptip Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
asn1.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
ASNValue.class.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
facebook.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
HTMLPurifier.auto.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
HTMLPurifier.autoload.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
HTMLPurifier.func.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
HTMLPurifier.includes.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
HTMLPurifier.kses.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
HTMLPurifier.path.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
HTMLPurifier.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
HTMLPurifier.safe-includes.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
markdown.php
oauth.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
OAuth1.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
openid.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
slinky.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
twitteroauth.php Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00