Merge branch 'master' into unicode_investigation

Conflicts:
	rtv/content.py
	rtv/main.py
	rtv/submission.py
	rtv/subreddit.py
This commit is contained in:
Michael Lazar
2015-03-12 21:29:17 -07:00
7 changed files with 23 additions and 16 deletions

View File

@@ -150,3 +150,5 @@ class SubredditPage(BasePage):
win.addnstr(row, 1, clean(text), n_cols-1, curses.A_BOLD)
text = ' {subreddit}'.format(**data)
win.addnstr(clean(text), n_cols - win.getyx()[1], Color.YELLOW)
text = ' {flair}'.format(**data)
win.addnstr(clean(text), n_cols - win.getyx()[1], Color.RED)