Octopress init
Site updated at 2014-11-07 10:12:50 UTC
Site updated at 2014-11-07 10:32:40 UTC
Site updated at 2014-11-19 18:46:38 UTC
Site updated at 2014-11-19 18:56:46 UTC
Site updated at 2014-11-20 04:24:16 UTC
Site updated at 2014-11-20 10:00:18 UTC
新增文档
Site updated at 2014-11-20 10:05:38 UTC
Merge branch 'master' of github.com:jicheng1014/jicheng1014.github.io into source

Conflicts:
	atom.xml
	blog/archives/index.html
	index.html
	javascripts/twitter.js
	sitemap.xml
	stylesheets/screen.css
Merge branch 'master' of github.com:jicheng1014/jicheng1014.github.io into source

Conflicts:
	atom.xml
	blog/2014/11/20/simple-formzai-bootstrapxia-de-wen-ti/index.html
	blog/categories/apple/atom.xml
	blog/categories/appstore/atom.xml
	blog/categories/bootstrap/atom.xml
	blog/categories/gem/atom.xml
	blog/categories/rails/atom.xml
	blog/categories/ruby/atom.xml
	blog/categories/simple-form/atom.xml
	blog/categories/wai-bao/atom.xml
	blog/categories/yuan-cheng-gong-zuo/atom.xml
	blog/categories/yue-du-ping-lun/atom.xml
	sitemap.xml
Site updated at 2014-11-20 15:09:54 UTC
新的内容
Merge branch 'master' of github.com:jicheng1014/jicheng1014.github.io into source

Conflicts:
	atom.xml
	blog/categories/apple/atom.xml
	blog/categories/appstore/atom.xml
	blog/categories/bootstrap/atom.xml
	blog/categories/gem/atom.xml
	blog/categories/rails/atom.xml
	blog/categories/ruby/atom.xml
	blog/categories/simple-form/atom.xml
	blog/categories/wai-bao/atom.xml
	blog/categories/yuan-cheng-gong-zuo/atom.xml
	blog/categories/yue-du-ping-lun/atom.xml
	sitemap.xml
Site updated at 2014-11-20 15:15:59 UTC
Merge branch 'master' of github.com:jicheng1014/jicheng1014.github.io into source

Conflicts:
	blog/archives/index.html
Merge branch 'source' of github.com:jicheng1014/jicheng1014.github.io into source

Conflicts:
	source/_posts/2014-11-20-simple-formzai-bootstrapxia-de-wen-ti.markdown