Skip to content
Snippets Groups Projects
Commit 519bb04a authored by Marcela Ribeiro de Oliveira's avatar Marcela Ribeiro de Oliveira
Browse files

Merge branch 'master' into 'issue/282'

# Conflicts:
#   app/serializers/user_serializer.rb
parents dd760fd9 64def090
No related branches found
No related tags found
No related merge requests found
Showing
No files found.
with 0 additions and 0 deletions
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment