fixed merge problem

tsuru · Jul 28, 2014 · ca441e2 · ca441e2
1 parent 838e0b1
commit ca441e2
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/webserver/main.go b/webserver/main.go
@@ -51,6 +51,7 @@ For an example conf check gandalf/etc/gandalf.conf file.\n %s`
 	router.Get("/repository/:name/tree", http.HandlerFunc(api.GetTree))
 	router.Get("/repository/:name/branch", http.HandlerFunc(api.GetBranch))
 	router.Get("/repository/:name/tag", http.HandlerFunc(api.GetTag))
+	router.Get("/repository/:name/diff/commits", http.HandlerFunc(api.GetDiff))
 	router.Get("/healthcheck/", http.HandlerFunc(api.HealthCheck))
 	router.Post("/hook/:name", http.HandlerFunc(api.AddHook))