Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

cleaning-portalmec
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

12bc089c

Commit 12bc089c authored 8 years ago by Israel Barreto Sant'Anna

Downloads
- Plain Diff

Merge branch 'master' into show-public-collections

parents 35a20fb5 171e7bc9

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

app/controllers/v1/learning_objects_controller.rb 6 additions, 1 deletion

app/controllers/v1/learning_objects_controller.rb
app/serializers/collection_serializer.rb 1 addition, 1 deletion

app/serializers/collection_serializer.rb

with 7 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment