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

Merge branch 'master' of https://github.com/inducer/relate into datatable_i18n 

Conflicts:
	relate/settings.py
parents 7a3659e9 baa8b32f
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