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

Merge branch 'master' into generate-thumbnails 

Conflicts:
	app/repositories/orient_db/learning_object_repository.rb
	config/routes.rb
parents 534db87f 9809dc81
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 541 additions and 461 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