diff options
| author | Peter Grassberger <petertheone@gmail.com> | 2016-04-01 15:30:45 (GMT) |
|---|---|---|
| committer | Peter Grassberger <petertheone@gmail.com> | 2016-04-01 15:30:45 (GMT) |
| commit | 8db94592d6222fbd0153cf05c83724d7ac518634 (patch) | |
| tree | fe89e9ed21ce849f3f5fcbfecff335d1cc90f409 /rh-bin | |
| parent | 3c584d7ee53ecfb35f32a2182971dfbc30009590 (diff) | |
| parent | 4a79af6bf48f7543a407d86fc73ce70f39fc6d94 (diff) | |
Merge branch 'master' into rdxportjs-refactor
Conflicts:
www/js/importer.js
www/js/jingles.js
www/js/musicpools.js
www/js/shows.js
Diffstat (limited to 'rh-bin')
| -rwxr-xr-x | rh-bin/authtoken.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rh-bin/authtoken.json b/rh-bin/authtoken.json index 7b2fdba..9e4c332 100755 --- a/rh-bin/authtoken.json +++ b/rh-bin/authtoken.json @@ -59,4 +59,4 @@ $answer{'token'} = $token; print "Content-type: application/json; charset=UTF-8\n"; print "Status: $responsecode\n\n"; -print encode_json \%answer; +print JSON->new->encode(\%answer); |