-
- Downloads
Merge branch 'develop' into 'spotit_multi_org'
# Conflicts: # VIPSWeb/static/js/frontpage.js
Showing
- VIPSWeb/locale/zh_CN/LC_MESSAGES/django.mo 0 additions, 0 deletionsVIPSWeb/locale/zh_CN/LC_MESSAGES/django.mo
- VIPSWeb/locale/zh_Hans/LC_MESSAGES/django.mo 0 additions, 0 deletionsVIPSWeb/locale/zh_Hans/LC_MESSAGES/django.mo
- VIPSWeb/locale/zh_Hans/LC_MESSAGES/django.po 196 additions, 0 deletionsVIPSWeb/locale/zh_Hans/LC_MESSAGES/django.po
- VIPSWeb/locale/zh_Hans/LC_MESSAGES/djangojs.mo 0 additions, 0 deletionsVIPSWeb/locale/zh_Hans/LC_MESSAGES/djangojs.mo
- VIPSWeb/locale/zh_Hans/LC_MESSAGES/djangojs.po 1 addition, 1 deletionVIPSWeb/locale/zh_Hans/LC_MESSAGES/djangojs.po
- applefruitmoth/locale/de/LC_MESSAGES/django.mo 0 additions, 0 deletionsapplefruitmoth/locale/de/LC_MESSAGES/django.mo
- applefruitmoth/locale/nb/LC_MESSAGES/django.mo 0 additions, 0 deletionsapplefruitmoth/locale/nb/LC_MESSAGES/django.mo
- applefruitmoth/locale/zh_CN/LC_MESSAGES/zh_CN.mo 0 additions, 0 deletionsapplefruitmoth/locale/zh_CN/LC_MESSAGES/zh_CN.mo
- applefruitmoth/locale/zh_Hans/LC_MESSAGES/django.mo 0 additions, 0 deletionsapplefruitmoth/locale/zh_Hans/LC_MESSAGES/django.mo
- applefruitmoth/locale/zh_Hans/LC_MESSAGES/django.po 1 addition, 1 deletionapplefruitmoth/locale/zh_Hans/LC_MESSAGES/django.po
- calculators/locale/de/LC_MESSAGES/django.mo 0 additions, 0 deletionscalculators/locale/de/LC_MESSAGES/django.mo
- calculators/locale/nb/LC_MESSAGES/django.mo 0 additions, 0 deletionscalculators/locale/nb/LC_MESSAGES/django.mo
- calculators/locale/zh_CN/LC_MESSAGES/django.mo 0 additions, 0 deletionscalculators/locale/zh_CN/LC_MESSAGES/django.mo
- calculators/locale/zh_Hans/LC_MESSAGES/django.mo 0 additions, 0 deletionscalculators/locale/zh_Hans/LC_MESSAGES/django.mo
- calculators/locale/zh_Hans/LC_MESSAGES/django.po 128 additions, 0 deletionscalculators/locale/zh_Hans/LC_MESSAGES/django.po
- cerealblotchmodels/locale/de/LC_MESSAGES/django.mo 0 additions, 0 deletionscerealblotchmodels/locale/de/LC_MESSAGES/django.mo
- cerealblotchmodels/locale/nb/LC_MESSAGES/django.mo 0 additions, 0 deletionscerealblotchmodels/locale/nb/LC_MESSAGES/django.mo
- cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.mo 0 additions, 0 deletionscerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.mo
- cerealblotchmodels/locale/zh_Hans/LC_MESSAGES/django.mo 0 additions, 0 deletionscerealblotchmodels/locale/zh_Hans/LC_MESSAGES/django.mo
- cerealblotchmodels/locale/zh_Hans/LC_MESSAGES/django.po 415 additions, 0 deletionscerealblotchmodels/locale/zh_Hans/LC_MESSAGES/django.po
File deleted
VIPSWeb/locale/zh_Hans/LC_MESSAGES/django.mo
0 → 100644
File added
No preview for this file type
No preview for this file type
No preview for this file type
File deleted
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
File added
No preview for this file type
No preview for this file type
No preview for this file type
File added
Please register or sign in to comment