jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolve conflict

This commit is contained in:
whimlex 2015-01-26 17:47:33 +08:00
parent 64cbeddd13
commit e5e24c1163
3 changed files with 272 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/layouts/_base_feedback.html.erb
View File

@ -135,7 +135,6 @@ function f_submit()
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=gb2312" />
<title>意见反馈</title>
</head>