xxq250 b760d17988 Merge branch 'standalone_develop' into dev_osredm_server ... # 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		2025-03-20 14:32:54 +08:00
..
assets	init project	2020-03-09 00:40:16 +08:00
gitlink	更换短信模板	2022-09-15 13:52:10 +08:00
tasks	Merge branch 'standalone_develop' into dev_osredm_server	2025-03-20 14:32:54 +08:00
templates/erb/scaffold	init project	2020-03-09 00:40:16 +08:00
gitlink.rb	FIX code review	2021-11-11 18:03:30 +08:00