Skip to content

Commit

Permalink
Merge branch 'master' into add_fake_tenant
Browse files Browse the repository at this point in the history
  • Loading branch information
nati committed May 26, 2016
2 parents 11853c7 + cbef079 commit 37d6c3b
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions server/server.go
Expand Up @@ -289,6 +289,7 @@ func NewServer(configFile string) (*Server, error) {
server.martini.Use(func(rw http.ResponseWriter, r *http.Request) {
rw.Header().Add("Access-Control-Allow-Origin", cors)
rw.Header().Add("Access-Control-Allow-Headers", "X-Auth-Token, Content-Type")
rw.Header().Add("Access-Control-Expose-Headers", "X-Total-Count")
rw.Header().Add("Access-Control-Allow-Methods", "GET,PUT,POST,DELETE")
})
}
Expand Down

0 comments on commit 37d6c3b

Please sign in to comment.