# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1491167187 -7200
# Node ID 0909de054b3f8e06dc233ef5a396db11f2a2f3f2
# Parent  1bf47706aefb06b316ab34374d90d8b6f2786160# Parent  75e37366a03ffaeb86bfab29b4603a9c62ab6719
Merge 0.10->trunk

diff -r 1bf47706aefb -r 0909de054b3f .luacheckrc
--- a/.luacheckrc	Sun Apr 02 00:24:37 2017 +0200
+++ b/.luacheckrc	Sun Apr 02 23:06:27 2017 +0200
@@ -23,7 +23,6 @@
 		"module.event_handlers",
 		"module.reloading",
 		"module.saved_state",
-		"module.environment",
 		"module.global",
 		"module.path",
 
@@ -87,6 +86,7 @@
 		"module.save",
 		"module.restore",
 		"module.command",
+		"module.environment",
 	};
 }
 files["tests/"] = {
diff -r 1bf47706aefb -r 0909de054b3f plugins/mod_mam/mod_mam.lua
--- a/plugins/mod_mam/mod_mam.lua	Sun Apr 02 00:24:37 2017 +0200
+++ b/plugins/mod_mam/mod_mam.lua	Sun Apr 02 23:06:27 2017 +0200
@@ -38,7 +38,7 @@
 local strip_tags = module:get_option_set("dont_archive_namespaces", { "http://jabber.org/protocol/chatstates" });
 
 local archive_store = module:get_option_string("archive_store", "archive");
-local archive = assert(module:open_store(archive_store, "archive"));
+local archive = module:open_store(archive_store, "archive");
 
 if archive.name == "null" or not archive.find then
 	if not archive.find then