Skip to content
Snippets Groups Projects
user avatar
Martin Staehr authored
# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/PhasesImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/states/model/Constraints.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/AssessmentDBCommunication.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/service/CommunicationDummyService.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/JournalServiceImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/service/ProjectDescriptionImpl.java
#	gemeinsamforschen/src/main/webapp/journal/edit-description.jsp
#	gemeinsamforschen/src/main/webapp/management/js/changePhase.js
d2f060da
History
Name Last commit Last update
..