Merge the master branch into Greg's branch #242

Merged
greg6775 merged 34 commits from master into greg-dev 2019-12-23 14:25:02 +01:00
Showing only changes of commit 0471d4fa1b - Show all commits

View file

@ -23,9 +23,9 @@ success\! = Success\!
commands.fun.avatar.success.title = Avatar of %extra%
commands.fun.avatar.help.description = Sends the avatar of the specified member.
commands.fun.gif.error.description = Please try again with another term.
commands.fun.gif.help.description = Look for a GIF on Giphy
commands.fun.meme.success.title = Your random meme
commands.fun.meme.api.error = The request to the meme API could not be processed. Please try it again later.
commands.fun.gif.help.description = Looks for a GIF on Giphy.
commands.fun.meme.success.title = Your random meme\:
commands.fun.meme.api.error = The request to the meme API could not be processed. Please try again later.
commands.fun.meme.help.description = Sends you a random meme.
commands.fun.clyde.help.description = Sends a message as a webhook named Clyde.