init html edit
back to html text edit
i18n activeadmin
merge conflict on admin/projects/*
customise activeadmin
config fastDFS, add init_data
merge with test, fastdfs step
git pull merge local, modify application