Skip to content
Snippets Groups Projects
Commit b02fe31e authored by Bruno Nocera Zanette's avatar Bruno Nocera Zanette
Browse files

Merge branch 'master' into sidekiq-workers 

Conflicts:
	app/repositories/orient_db/learning_object_repository.rb
parents ab40d0f7 12447f5b
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 0 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