Merge branch 'bookmarks'

2014-12-09 19:44:01 -06:00
parent 5b073c4978 6ceb5fc5ed
commit f2e6be81d2
40 changed files with 5812 additions and 511 deletions
--- a/main.go
+++ b/main.go
@@ -165,6 +165,7 @@ func startServer() {
 	router.GET("/explain", API_ExplainQuery)
 	router.POST("/explain", API_ExplainQuery)
 	router.GET("/history", API_History)
+	router.GET("/bookmarks", API_Bookmarks)
 	router.GET("/static/:type/:name", API_ServeAsset)

 	fmt.Println("Starting server...")