Funcionalitats votacions
Funcionalitats Votacions acabades
Funcionalitats votacions
Funcionalitats Votacions acabades
.
Merge branch 'sistemaVotacions' of
https://github.com/TripBoxDev/TB_Backend.git into sistemaVotacions

Conflicts:
	src/main/java/com/tripbox/services/GroupServiceImpl.java
	src/main/java/com/tripbox/services/UserServiceImpl.java
Branca pel merge
Merge branch 'sistemaVotacions+test'

Conflicts:
	src/main/java/com/tripbox/api/GroupRESTImpl.java
	src/main/java/com/tripbox/api/interfaces/GroupREST.java
	src/main/java/com/tripbox/services/GroupServiceImpl.java
	src/main/java/com/tripbox/services/interfaces/GroupService.java
Delete .jsdtscope
Delete org.eclipse.jdt.core.prefs
Delete org.eclipse.m2e.core.prefs
Delete org.eclipse.wst.common.component
Delete org.eclipse.wst.common.project.facet.core.xml
Delete org.eclipse.wst.jsdt.ui.superType.container
Delete org.eclipse.wst.jsdt.ui.superType.name
Delete .classpath
Delete .gitignore
Delete .project
Delete pom.xml
pom.xml recuperat