forked from saurabh/orbit4-5
Conflicts: app/helpers/orbit_helper.rb |
||
---|---|---|
.. | ||
_form.html.erb | ||
_widget_form.html.erb | ||
edit.html.erb | ||
edit_sub_part.html.erb | ||
getwidgets.html.erb | ||
new.html.erb |
Conflicts: app/helpers/orbit_helper.rb |
||
---|---|---|
.. | ||
_form.html.erb | ||
_widget_form.html.erb | ||
edit.html.erb | ||
edit_sub_part.html.erb | ||
getwidgets.html.erb | ||
new.html.erb |