Fixing merge issue
Fixing merge issue

cadecairos/mattermoz,bkeroack/platform,rgarmsen2295/platform,dimitertodorov/platform,andela/mattermost-platform,ninja-/platform,trashcan/platform,kernicPanel/platform,fosstp/platform,lawrenae/mattermost,StateFarmIns/mattermost,samogot/platform,asaadmahmoodspin/platform,tbolon/platform,mozilla/mattermoz,ZBoxApp/platform,fosstp/platform,mozilla/mattermoz,42wim/platform,rgarmsen2295/platform,cadecairos/mattermoz,tbolon/platform,daizenberg/platform,rompic/platform,samogot/platform,raghavenc5/TabGen,ninja-/platform,raghavenc5/TabGen,trashcan/platform,rahulltkr/platform,StateFarmIns/mattermost,mozilla/mattermoz,bkeroack/platform,rahulltkr/platform,rompic/platform,trashcan/platform,dotcominternet/platform,ZBoxApp/platform,bkeroack/platform,ninja-/platform,ttyniwa/platform,numericube/platform,asaadmahmoodspin/platform,ZBoxApp/platform,kernicPanel/platform,mozilla/mattermoz,fosstp/platform,daizenberg/platform,numericube/platform,npcode/platform,florianorben/platform,npcode/platform,ninja-/platform,lawrenae/mattermost,samogot/platform,rompic/platform,mozilla/mattermoz,asaadmahmoodspin/platform,kernicPanel/platform,cyanlime/platform,florianorben/platform,rgarmsen2295/platform,rgarmsen2295/platform,cyanlime/platform,ttyniwa/platform,florianorben/platform,andela/mattermost-platform,tbalthazar/platform,dimitertodorov/platform,dotcominternet/platform,cadecairos/mattermoz,florianorben/platform,bkeroack/platform,cyanlime/platform,raghavenc5/TabGen,andela/mattermost-platform,lawrenae/mattermost,raghavenc5/TabGen,rahulltkr/platform,rahulltkr/platform,florianorben/platform,numericube/platform,kernicPanel/platform,raghavenc5/TabGen,trashcan/platform,fosstp/platform,rgarmsen2295/platform,npcode/platform,ZBoxApp/platform,ttyniwa/platform,cadecairos/mattermoz,StateFarmIns/mattermost,andela/mattermost-platform,tbolon/platform,ZBoxApp/platform,lawrenae/mattermost,42wim/platform,StateFarmIns/mattermost,42wim/platform,ninja-/platform,ttyniwa/platform,daizenberg/platform,dotcominternet/platform,cadecairos/mattermoz,ttyniwa/platform,cyanlime/platform,npcode/platform,andela/mattermost-platform,tbolon/platform,kernicPanel/platform,npcode/platform,tbalthazar/platform,tbalthazar/platform,dimitertodorov/platform,dotcominternet/platform,tbolon/platform,StateFarmIns/mattermost,trashcan/platform,bkeroack/platform,lawrenae/mattermost