Merge branch 'master' into release

This commit is contained in:
Jay 2018-08-22 20:14:45 +08:00
commit 6db4e26173

View File

@ -19,7 +19,7 @@ const typeTwitch = async (c, n) => {
} }
const typeSystem = async (c, n) => { const typeSystem = async (c, n) => {
let text = `select * from "public"."twitch_channel"` let text = `select * from "public"."twitch_channel" order by "name" asc`
let values = [] let values = []
let result = await c.db.query({text, values}) let result = await c.db.query({text, values})
c.state.channelList = result.rows c.state.channelList = result.rows