Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

V

VIPSWeb
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

cd2fdf0e

Commit cd2fdf0e authored 5 years ago by Tor-Einar Skog

Downloads
- Plain Diff

Merge branch 'develop' into 'spotit_multi_org'

# Conflicts:
#   VIPSWeb/static/js/frontpage.js

parents 0c712538 044b574f

Branches

No related tags found

Loading

Changes 67

Hide whitespace changes

Inline Side-by-side

Showing

vips_messages/locale/bs/LC_MESSAGES/django.mo 0 additions, 0 deletions

vips_messages/locale/bs/LC_MESSAGES/django.mo
vips_messages/locale/de/LC_MESSAGES/django.mo 0 additions, 0 deletions

vips_messages/locale/de/LC_MESSAGES/django.mo
vips_messages/locale/nb/LC_MESSAGES/django.mo 0 additions, 0 deletions

vips_messages/locale/nb/LC_MESSAGES/django.mo
vips_messages/locale/vi/LC_MESSAGES/django.mo 0 additions, 0 deletions

vips_messages/locale/vi/LC_MESSAGES/django.mo
vips_messages/locale/zh_CN/LC_MESSAGES/django.mo 0 additions, 0 deletions

vips_messages/locale/zh_CN/LC_MESSAGES/django.mo
vips_messages/locale/zh_Hans/LC_MESSAGES/django.mo 0 additions, 0 deletions

vips_messages/locale/zh_Hans/LC_MESSAGES/django.mo
vips_messages/locale/zh_Hans/LC_MESSAGES/django.po 70 additions, 0 deletions

vips_messages/locale/zh_Hans/LC_MESSAGES/django.po

with 70 additions and 0 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment