developers/Orbit
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

solved conflicts

Browse Source
This commit is contained in:
Matt K. Fu committed 2013-04-17 14:14:24 +08:00
1 parent e7bffe4c0f
commit 0781779ac0
28 files changed
+316 -265
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/views/admin/module_apps/_app_selector.html.erb
+1 -1
View File
@@ -1 +1 @@
<%= f.select :module_app_id, @apps.collect { |t| [t.module_name, t.id] }, {:include_blank => true} ,{:rel => admin_module_apps_path } %>
<%= f.select :module_app_id, @module_apps.collect { |t| [t.module_name, t.id] }, {:include_blank => true} ,{:rel => admin_module_apps_path } %>