friendica

Files

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

acl.js

2012-04-05 13:39:15 +02:00

ajaxupload.js

2012-04-05 13:39:15 +02:00

country.js

2012-04-05 13:39:15 +02:00

fk.autocomplete.js

2012-04-05 13:39:15 +02:00

jquery.htmlstream.js

2012-04-05 13:39:15 +02:00

jquery.js

2012-04-05 13:39:15 +02:00

jquery.textinputs.js

2012-04-05 13:39:15 +02:00

main.js

2012-04-05 13:39:15 +02:00

webtoolkit.base64.js

2012-04-05 13:39:15 +02:00