Commit Graph

2 Commits (957b3e27b82c7e04634b97e87fdc31c34fcf6786)

Author SHA1 Message Date
noud 957b3e27b8 Merge branch 'master' into develop
Conflicts:
	app/Controller/ServersController.php
2012-11-20 11:01:18 +01:00
noud c62fafdd93 Continious Integration
Jenkins makefile.
2012-09-25 11:45:08 +02:00