Merge remote-tracking branch 'origin/master' into custom_commands2

Conflicts:
	rtv/exceptions.py
This commit is contained in:
Michael Lazar
2016-07-22 23:46:16 -07:00
78 changed files with 55763 additions and 23613 deletions

View File

@@ -124,7 +124,9 @@ SUBREDDIT_POST = c
SUBREDDIT_OPEN = l, <KEY_RIGHT>
SUBREDDIT_OPEN_IN_BROWSER = o, <LF>, <KEY_ENTER>, <KEY_ENTER>
SUBREDDIT_OPEN_SUBSCRIPTIONS = s
SUBREDDIT_OPEN_MULTIREDDITS = S
SUBREDDIT_FRONTPAGE = p
; Subscription page
SUBSCRIPTION_SELECT = l, <LF>, <KEY_ENTER>, <KEY_RIGHT>
SUBSCRIPTION_EXIT = h, s, <ESC>, <KEY_LEFT>
SUBSCRIPTION_EXIT = h, s, S, <ESC>, <KEY_LEFT>