forked from Trustie/forgeplus
xxq250
b760d17988
# Conflicts: # app/controllers/accounts_controller.rb # app/controllers/admins/users_controller.rb # app/controllers/application_controller.rb # app/controllers/owners_controller.rb # app/helpers/application_helper.rb # app/helpers/avatar_helper.rb # app/models/edu_setting.rb # app/models/user.rb # app/models/user_action.rb # app/views/layouts/admin.html.erb # app/views/projects/index.json.jbuilder # config/harmonious_dictionary/chinese_dictionary.txt # config/harmonious_dictionary/harmonious.hash # config/harmonious_dictionary/harmonious_english.yml # config/routes/api.rb |
||
|---|---|---|
| .. | ||
| _form.html.erb | ||
| _node_input.json.jbuilder | ||
| _node_select.json.jbuilder | ||
| edit.html.erb | ||
| index.html.erb | ||
| index.json.jbuilder | ||
| new.html.erb | ||
| show.json.jbuilder | ||