mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-11-08 07:21:03 +08:00
Conflicts: app/serializers/api/v1/activity_serializer.rb app/serializers/api/v1/inventory_column_serializer.rb app/serializers/api/v1/project_serializer.rb |
||
|---|---|---|
| .. | ||
| inventories_controller_spec.rb | ||
| inventory_columns_controller_spec.rb | ||
| inventory_items_controller_spec.rb | ||
| inventory_list_items_controller_spec.rb | ||
| teams_controller_spec.rb | ||
| user_identities_controller_spec.rb | ||
| users_controller_spec.rb | ||