diff options
| author | Loïc Hoguin <[email protected]> | 2014-09-24 12:42:39 +0300 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-09-24 12:42:39 +0300 |
| commit | dc36eace3e0b10dffcd0ad1135a9a2b0d4ffd938 (patch) | |
| tree | 9f5bd1625d84127404c5c6cd2e03332b6a82d2aa | |
| parent | 0951a6bf501dc9ef9e4249fc72ea4cc626e25e6f (diff) | |
| parent | fb891a741956b2edb8a23e78c853d71440bccacc (diff) | |
| download | erlang.mk-dc36eace3e0b10dffcd0ad1135a9a2b0d4ffd938.tar.gz erlang.mk-dc36eace3e0b10dffcd0ad1135a9a2b0d4ffd938.tar.bz2 erlang.mk-dc36eace3e0b10dffcd0ad1135a9a2b0d4ffd938.zip | |
Merge branch 'rest_template_fix' of git://github.com/ericsagnes/erlang.mk
| -rw-r--r-- | erlang.mk | 2 | ||||
| -rw-r--r-- | plugins/bootstrap.mk | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -421,7 +421,7 @@ tpl_cowboy_rest = "-module($(n))." \ " {upgrade, protocol, cowboy_rest}." \ "" \ "content_types_provided(Req, State) ->" \ - " {[{{<<\"text\">>, <<\"html\">>, '_'}, get_html}], Req, State}." \ + " {[{{<<\"text\">>, <<\"html\">>, '*'}, get_html}], Req, State}." \ "" \ "get_html(Req, State) ->" \ " {<<\"<html><body>This is REST!</body></html>\">>, Req, State}." diff --git a/plugins/bootstrap.mk b/plugins/bootstrap.mk index c3615be..084cde3 100644 --- a/plugins/bootstrap.mk +++ b/plugins/bootstrap.mk @@ -162,7 +162,7 @@ tpl_cowboy_rest = "-module($(n))." \ " {upgrade, protocol, cowboy_rest}." \ "" \ "content_types_provided(Req, State) ->" \ - " {[{{<<\"text\">>, <<\"html\">>, '_'}, get_html}], Req, State}." \ + " {[{{<<\"text\">>, <<\"html\">>, '*'}, get_html}], Req, State}." \ "" \ "get_html(Req, State) ->" \ " {<<\"<html><body>This is REST!</body></html>\">>, Req, State}." |