Skip to content
Commit c2cf4ca8 authored by Dong Zhuang's avatar Dong Zhuang
Browse files

Merge branch 'master' of git://github.com/inducer/relate into i18n_fix 

Conflicts:
	locale/zh_CN/LC_MESSAGES/django.po
parents 4cba382a 00515d41
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment