Merge branch 'master' of github.com:Jiiks/BetterDiscordApp into bttv-update-nov5

Browse Source

# Conflicts:
#	data/emotedata_ffz.json

...

This commit is contained in:

Ehsan Kia 2016-11-06 00:48:42 -07:00

parent dc48d88d59 e09fb169ae

commit 5c70075ca0

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2

data/emotedata_ffz.json

View File

File diff suppressed because one or more lines are too long