Skip to content
Snippets Groups Projects
Commit 0a9b7a68 authored by Giovanne Marcelo's avatar Giovanne Marcelo
Browse files

Merge branch 'master' into feature-tags 

Conflicts:
	app/serializers/learning_object_serializer.rb
	config/routes.rb
parents aeb5dbb6 d9299124
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 414 additions and 470 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment