developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NCCU 上傳版本 0709

Browse Source 
Merge branch 'nccu0621'

Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
This commit is contained in:
Matthew K. Fu JuYuan committed 2012-07-09 16:02:59 +08:00
2 parents 3f95fe4f13 49862e70f9
commit 09d46f2f75
79 files changed
+683 -278
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
Vendored
+2 -1
View File
@@ -19,5 +19,6 @@
<%end -%>
</td>
<td><%= display_date_time(page_context.updated_at) %></td>
<td><%= User.find(page_context.create_user_id).name rescue ''%></td>
<td><%= User.find(page_context.create_user_id).name rescue '' %></td>
</tr>