friendica/js
rabuzarus 01b02dbcaa Merge develop into 1404_reworked_autocomplete
Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
2016-04-14 16:23:51 +02:00
..
acl.js
ajaxupload.js
autocomplete.js
country.js
filebrowser.js
fk.autocomplete.js
jquery-migrate.js
jquery.htmlstream.js
jquery.js
jquery.textinputs.js
main.js Merge develop into 1404_reworked_autocomplete 2016-04-14 16:23:51 +02:00
modernizr.js
webtoolkit.base64.js