tree bfd6aff3cc4e365362424021b26d27004a46da9d
parent c3476c755bb751f59bd412091d8f133da1caa8b3
parent 526ce795cc50145432718f0fb95373a1eb140b5a
author Paladox <thomasmulhall410@yahoo.com> 1479906986 +0000
committer Paladox <thomasmulhall410@yahoo.com> 1479907027 +0000

Merge branch 'stable-2.13'

* stable-2.13:
  Doc: Use correct request type for resume
  Disable hash tags when NoteDb is disabled
  ReplayChange: Cleanup redundant else clauses
  Do not fail because of invalid SSH key

Change-Id: I344df8b01e96842e9654e1649696aaa0046b939a