Merge Upstream

This commit is contained in:
Andreas Bielawski
2016-07-05 13:14:22 +02:00
17 changed files with 674 additions and 459 deletions

View File

@ -2,6 +2,7 @@ local weather = {}
local HTTPS = require('ssl.https')
local URL = require('socket.url')
local HTTP = require('socket.http')
local JSON = require('dkjson')
local utilities = require('otouto.utilities')
local bindings = require('otouto.bindings')