Merge remote-tracking branch 'origin/master' into woorst-more_listings

Conflicts:
	rtv/rtv.cfg
	tests/test_subreddit.py
This commit is contained in:
Michael Lazar
2016-07-21 14:21:34 -07:00
7 changed files with 3125 additions and 23 deletions

View File

@@ -42,6 +42,7 @@ In subreddit mode you can browse through the top submissions on either the front
:``o`` or ``ENTER``: Open the submission link with your web browser
:``/``: Open a prompt to switch subreddits
:``f``: Open a prompt to search the current subreddit
:``p``: Toggle between the front page and the last visited subreddit
The ``/`` prompt accepts subreddits in the following formats