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

b40d0d4a

Commit b40d0d4a authored 8 years ago by Bernardo Chagas

Downloads
- Plain Diff

Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec into statistics_controller

parents dc428358 a1cdf55e

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

app/serializers/collection_serializer.rb 1 addition, 1 deletion

app/serializers/collection_serializer.rb
app/serializers/user_serializer.rb 6 additions, 2 deletions

app/serializers/user_serializer.rb
app/services/learning_object_publisher.rb 1 addition, 0 deletions

app/services/learning_object_publisher.rb

with 8 additions and 3 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