mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-01-04 14:44:26 +08:00
e9c0b34662
Conflicts: Gemfile app/services/api.rb config/initializers/api.rb config/initializers/extends.rb config/routes.rb db/schema.rb spec/controllers/api/api_controller_spec.rb |
||
---|---|---|
.. | ||
migrate | ||
views | ||
load_users_template.yml | ||
schema.rb | ||
seeds.rb |