[Rt-commit] rt branch, master, updated. rt-4.2.12-352-ga9d1f36

[Shawn Moore]

The branch, master has been updated
       via  a9d1f36302237ebc1573a2c61dcf2519fced9e64 (commit)
       via  0e2d3eea897c0580f4f9ca88879238e0f2eeb20d (commit)
      from  0c05f5ad5b8ec27ef531699247fc3548039f92c5 (commit)

Summary of changes:
 share/html/Helpers/ShortcutHelp       | 14 +++++++++++++-
 share/static/js/keyboard-shortcuts.js |  9 ++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit a9d1f36302237ebc1573a2c61dcf2519fced9e64
Merge: 0c05f5a 0e2d3ee
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Wed Oct 28 22:08:40 2015 +0000

    Merge branch '4.4/shortcut-help-conditional'


-----------------------------------------------------------------------