# Conflicts:
#	package.json
#	src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java
#	src/main/java/at/ac/uibk/gitsearch/web/rest/ExerciseResource.java
#	src/main/webapp/app/bookmarks/bookmarks.component.ts
#	src/main/webapp/app/core/core.module.ts
#	src/main/webapp/app/exercise/service/exercise.service.ts
#	src/main/webapp/app/search/search.component.ts

thumbs_up button implementation

See merge request sharing/codeability-sharing-platform!54

Merge branch 'thumbs_up' of https://sharing-codeability.uibk.ac.at/sharing/codeability-sharing-platform into thumbs_up

against unauthorized users

against unauthorized users

Conflicts:
	.yo-rc.json
	package-lock.json
	src/main/resources/config/liquibase/master.xml
	src/main/webapp/app/exercise/exercise-details/exercise-details.component.html
	src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts
	src/main/webapp/app/search/search.component.ts
	src/main/webapp/i18n/de/global.json