aboutsummaryrefslogtreecommitdiffstats
path: root/js/fk.autocomplete.js
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-02-23 20:53:22 +0100
committerMichael <icarus@dabo.de>2012-02-23 20:53:22 +0100
commit0409b5cdba003b6ce90d5ad0181e81c06af95ab1 (patch)
treec677adb7c0e8140bdb1e115a95d1aa23fdf734ed /js/fk.autocomplete.js
parent311e35731c52102cbce3befc6343f179080ad38c (diff)
parent8cacff69858c2ad097bafb80c93405e79c311edf (diff)
downloadvolse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.gz
volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.bz2
volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.zip
Merge remote branch 'upstream/master'
Conflicts: include/bbcode.php
Diffstat (limited to 'js/fk.autocomplete.js')
-rwxr-xr-xjs/fk.autocomplete.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index 85b51baeb..509466bd9 100755
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -1,5 +1,5 @@
/**
- * Friendika people autocomplete
+ * Friendica people autocomplete
*
* require jQuery, jquery.textareas
*/