Merge branch 'db_connect' into develop
a2a28bf9db58
Actions

Authored by Franck Youssef <franck.youssef@epfl.ch> on May 3 2014, 01:57.

Description

Merge branch 'db_connect' into develop

Conflicts:
project/PPPServer/.classpath
project/PPPServer/config/config_server.fry.properties

Committed

Franck Youssef <franck.youssef@epfl.ch>

May 3 2014, 01:57

Pushed

raisaro

Apr 20 2017, 12:42

Parents

Branches

Unknown

Tags

Unknown

Franck Youssef <franck.youssef@epfl.ch> committed R3229:a2a28bf9db58: Merge branch 'db_connect' into develop (authored by Franck Youssef <franck.youssef@epfl.ch>).May 3 2014, 01:57

	Commit			Author	Details	Committed
	daf487fbbf78			Franck Youssef	config modifications at server	May 3 2014

				Path
	M			project/PPPCertifiedInstitution/.classpath
	M			project/PPPClient/.classpath
	M			project/PPPCommons/src/utils/ConfigProperties.java
	M			project/PPPServer/config/config_server.fry.properties