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
No related merge requests found
Showing
with 0 additions and 0 deletions
app/assets/images/icons/collection-add.png

8.91 KiB

app/assets/images/icons/collection-download.png

9.9 KiB

app/assets/images/icons/collection-fast.png

9.74 KiB

app/assets/images/icons/collection-items.png

3.42 KiB

app/assets/images/icons/collection-remove.png

8.56 KiB

app/assets/images/icons/collection.png

5.14 KiB

app/assets/images/icons/comments.png

4.28 KiB

app/assets/images/icons/contrast.png

2.23 KiB

app/assets/images/icons/download.png

9.5 KiB

app/assets/images/icons/filter.png

2.69 KiB

app/assets/images/icons/font-minus.png

2.18 KiB

app/assets/images/icons/font-plus.png

2.14 KiB

app/assets/images/icons/report-circle.png

8.13 KiB

app/assets/images/icons/report.png

22.8 KiB

app/assets/images/icons/search.png

9.11 KiB

app/assets/images/icons/selection-copy.png

8.78 KiB

app/assets/images/icons/selection-download.png

8.09 KiB

app/assets/images/icons/selection-move.png

9.79 KiB

app/assets/images/icons/star-gold.png

7.21 KiB

app/assets/images/icons/star-grey.png

7.23 KiB

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