Merge branch 'master' into movejs

Browse Source

Conflicts:
	version.inc

...

This commit is contained in:

friendica

2014-01-06 02:37:06 -08:00

parent 0c85c97480 ae8a30273a

commit 196b3022bd

18 changed files with 3341 additions and 3061 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

view/js/fk.autocomplete.js → view/js/autocomplete.js