Diego Mello 533933373e Merge branch 'develop' into new.delete-server ... # Conflicts: # app/lib/rocketchat.js		2020-05-04 16:52:26 -03:00
..
locales	Merge branch 'develop' into new.delete-server	2020-05-04 16:52:26 -03:00
index.js	[i18n] Added Japanese translation (#1781)	2020-02-28 14:24:10 -03:00