harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

2
view/php/theme_init.php
View File

@@ -25,7 +25,7 @@ head_add_js('jquery-migrate-1.1.1.js');
head_add_js('spin.js');
head_add_js('jquery.spin.js');
head_add_js('jquery.textinputs.js');
head_add_js('fk.autocomplete.js');
head_add_js('autocomplete.js');
head_add_js('library/fancybox/jquery.fancybox-1.3.4.js');
head_add_js('library/jquery.timeago.js');
head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js');