locale/zh_CN/LC_MESSAGES/django.po · c2cf4ca8e33615d68bd1ffcd9ff0022c09fc9c91 · Andreas Klöckner / relate · GitLab

Sep 17, 2015
c2cf4ca8
Merge branch 'master' of git://github.com/inducer/relate into i18n_fix · c2cf4ca8
Dong Zhuang authored Sep 17, 2015
```
Conflicts:
	locale/zh_CN/LC_MESSAGES/django.po
```
c2cf4ca8
Merge branch 'master' of git://github.com/inducer/relate into i18n_fix
Dong Zhuang authored Sep 17, 2015
```
Conflicts:
	locale/zh_CN/LC_MESSAGES/django.po
```