yexuejc/solo-skins
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 0.6.1

Browse Source 
Conflicts:
	neoease/js/neoease.js
	neoease/js/neoease.min.js
	timeline/css/timeline.min.css
	timeline/js/timeline.min.js
This commit is contained in:
Liang Ding
2013-08-24 14:18:26 +08:00
parent e705c23e7f 02dd34d716
commit f9b7011838
93 changed files with 7294 additions and 1020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
timeline/header.ftl
View File

@@ -41,7 +41,7 @@
<input type="hidden" name="oe" value="UTF-8" />
<input type="hidden" name="ie" value="UTF-8" />
<input type="hidden" name="newwindow" value="0" />
<input type="hidden" name="sitesearch" value="${blogHost}" />
<input type="hidden" name="sitesearch" value="${serverHost}" />
</form>
</div>
</div>