Merge Upstream

2016-07-05 13:14:22 +02:00
parent a3a136333a 9ebdbd9d3c
commit fb00312dd9
17 changed files with 674 additions and 459 deletions
--- a/otouto/plugins/weather.lua
+++ b/otouto/plugins/weather.lua
@ -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')