Merge branch 'develop' into admin-info
Conflicts: i18n/en.i18n.json packages/rocketchat-ui-admin/admin/adminInfo.html
Showing
- .meteor/packages 1 addition, 1 deletion.meteor/packages
- .meteor/versions 4 additions, 4 deletions.meteor/versions
- i18n/ar.i18n.json 10 additions, 8 deletionsi18n/ar.i18n.json
- i18n/de.i18n.json 20 additions, 10 deletionsi18n/de.i18n.json
- i18n/el.i18n.json 10 additions, 10 deletionsi18n/el.i18n.json
- i18n/en.i18n.json 16 additions, 27 deletionsi18n/en.i18n.json
- i18n/fi.i18n.json 13 additions, 10 deletionsi18n/fi.i18n.json
- i18n/fr.i18n.json 13 additions, 10 deletionsi18n/fr.i18n.json
- i18n/hr.i18n.json 9 additions, 6 deletionsi18n/hr.i18n.json
- i18n/km.i18n.json 12 additions, 9 deletionsi18n/km.i18n.json
- i18n/ko.i18n.json 10 additions, 10 deletionsi18n/ko.i18n.json
- i18n/ms-MY.i18n.json 10 additions, 10 deletionsi18n/ms-MY.i18n.json
- i18n/nl.i18n.json 23 additions, 10 deletionsi18n/nl.i18n.json
- i18n/pl.i18n.json 10 additions, 10 deletionsi18n/pl.i18n.json
- i18n/pt.i18n.json 10 additions, 10 deletionsi18n/pt.i18n.json
- i18n/ro.i18n.json 13 additions, 10 deletionsi18n/ro.i18n.json
- i18n/ru.i18n.json 12 additions, 10 deletionsi18n/ru.i18n.json
- i18n/tr.i18n.json 8 additions, 8 deletionsi18n/tr.i18n.json
- packages/rocketchat-channel-settings/i18n/de.i18n.json 3 additions, 0 deletionspackages/rocketchat-channel-settings/i18n/de.i18n.json
- packages/rocketchat-channel-settings/i18n/en.i18n.json 1 addition, 1 deletionpackages/rocketchat-channel-settings/i18n/en.i18n.json
Loading
Please register or sign in to comment