multisite init commit
wechat icon
sync settings for cn site
oldsite dump
# WARNING: head commit changed in the meantime

# WARNING: head commit changed in the meantime

multiple sites
new
Merge branch 'multiSites' into newMultiSite

Conflicts:
	.gitignore
	db/gpgproperty1.sql