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

@@ -27,7 +27,7 @@ class SubredditError(RTVError):
class SubscriptionError(RTVError):
"Subscriptions could not be fetched"
"Content could not be fetched"
class ProgramError(RTVError):