Merge branch 'master' into mam

ae58e3d1 · JC Brand · a0d344c7 · 1766aa75 · ae58e3d1 · ae58e3d1
Commit ae58e3d1 authored Jul 11, 2015 by JC Brand
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

converse.js converse.js +2 -1

docs/CHANGES.rst docs/CHANGES.rst +5 -0

No files found.
--- a/converse.js
+++ b/converse.js
@@ -5858,7 +5858,8 @@
                } catch (e) {
                    converse.log("Could not restore sessions. Error message: "+e.message);
                }
-            } else if (this.auto_login) {
+            }
+            if (this.auto_login) {
                if (!this.jid) {
                    throw new Error("initConnection: If you use auto_login, you also need to provide a jid value");
                }

--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
 Changelog
 =========
+0.9.5 (Unreleased)
+------------------
+* #439 auto_login and keepalive not working [jcbrand]
 0.9.4 (2015-07-04)
 ------------------