添加atom支持
Merge commit 'b3302f85c020fa7dfe822e1b41e071e0dab3fd2c'

合并订阅
Squashed 'content/publication/' changes from a272110..938ddb0

938ddb0 modify disqus for octopress
a3f4ed4 缺失图片
2a2be99 Merge commit '4c03750f07f0d230497ef619615378083851afd4'
4c03750 Squashed 'content/publication/' changes from 5937a4f..a272110
67bdf15 合并
9ee2ab5 Squashed 'content/publication/' changes from 44cd6f0..5937a4f
f4c0339 修改配置
41b320c 修改publication图片目录
dc0d436 增加问答系统
fb6f00a 添加图片和highlight
d16071f 修改fabric发布
89fea48 subtree
da3fb1e Merge commit '8cf118f3fefaa2d8728ccaa7f192af1ac1a3d832' as 'content/docs'
8cf118f Squashed 'content/docs/' content from commit bad0347
2f1224e title
cc8ec26 修改title
b7206cf 修改配置
b2bf993 修改帮助
19d5147 添加pelican环境
159fdea Squashed 'content/publication/' content from commit 44cd6f0
2478045 Merge commit '159fdeac8bcbb1b58744f6ff5369b4d7f0c986fc' as 'content/publication'
b082770 修改README
cf0769f Initial commit
REVERT: a272110 修改语法错误
REVERT: 5937a4f 修改图片路径
REVERT: 44cd6f0 修改标题
REVERT: 69858c4 Update alpha4.md
REVERT: a49404c Update alpha4.md
REVERT: 870da13 修改换行
REVERT: 5456adc 文字错误
REVERT: 40751c0 修改前言
REVERT: 0d8d953 抢了郎中的地盘
REVERT: ae6ff74 依然是只改错别字
REVERT: e0da448 no message
REVERT: c4b174e 添加作者照片
REVERT: bde1fbd Update alpha4.md
REVERT: 2e2955a Update alpha4.md
REVERT: 59c3232 合并九州专题
REVERT: 1d3d8be 修改专题内容
REVERT: 1be8435 修改code block
REVERT: 3804d7f 添加附加内容
REVERT: 0a46554 flask
REVERT: 960ca07 hightjs
REVERT: 21968c0 增加flask内容
REVERT: a090c87 修改
REVERT: 93e0fab init alpha4
REVERT: f8fc801 推荐
REVERT: b6b99c0 Update alpha3.md
REVERT: 91f0cd7 修改三处文法问题
REVERT: 3af3a84 图片
REVERT: 53d2283 Merge remote-tracking branch 'origin/master'
REVERT: da446b4 Update alpha3.md
REVERT: 280c7ab Update alpha3.md
REVERT: d7478ac no message
REVERT: 1c2f4c0 添加照片
REVERT: ea6ebf0 对细节做了一些修正。
REVERT: 90caa79 修改列表链接
REVERT: c76ba41 Create alpha7.md
REVERT: d75c4b8 增加TIP，一段代码，资源推荐栏目内容
REVERT: aad9ae9 格式
REVERT: cac713e 格式
REVERT: 0c4247a Update alpha1.md
REVERT: 6027645 添加专栏
REVERT: c994570 修改格式
REVERT: 3f5a449 ownone column
REVERT: f0005ae Update README.md
REVERT: e609989 Update README.md
REVERT: 1eeb435 qq群二维码
REVERT: bc4bb0f alph5
REVERT: c3e4239 修改版本号
REVERT: b724964 修改图片路径
REVERT: 11a61f7 添加微博
REVERT: 36a1da3 修改代码配色
REVERT: e8b7871 添加照片
REVERT: 5ee1da7 Update alpha2.md
REVERT: f51d973 Update alpha2.md
REVERT: bac7159 Update alpha2.md
REVERT: c29ce92 Update alpha2.md
REVERT: 10eeab6 Update alpha2.md
REVERT: 034f6d7 Update alpha2.md
REVERT: e83dbaa Update alpha2.md
REVERT: a0872fe Update alpha2.md
REVERT: 1bfe9cf Update alpha2.md
REVERT: d973d58 Update alpha2.md
REVERT: 4b28117 Update alpha2.md
REVERT: e88817c Update alpha2.md
REVERT: cefbb38 修改目录
REVERT: 4c97912 修改目录
REVERT: 9ca7380 添加代码
REVERT: 4720388 Delete test.rst
REVERT: 6579014 Create test.rst
REVERT: fbcd51d 编辑简明笔记
REVERT: bcf339d Update alpha2.md
REVERT: 5f345ec Update alpha2.md
REVERT: a9a2a78 Update alpha2.md
REVERT: 94a6ae8 Update alpha2.md
REVERT: e8ea53f 修改排版
REVERT: 9311d05 修改代码块的语法markdown
REVERT: 690f676 Merge pull request #3 from linsongze/master
REVERT: cb4bafc 内容完成
REVERT: fcf4b80 creat
REVERT: c339548 修改大小
REVERT: eac3b05 添加微信
REVERT: c0fdb28 Update README.md
REVERT: e907e0c Update README.md
REVERT: bfd4622 Create alpha2.md
REVERT: 928b033 排版错误
REVERT: dc9166b 群号与说明
REVERT: 734cacd 前言
REVERT: f7f9250 Update alpha1.md
REVERT: 60fc8b1 Merge pull request #2 from mmCAtE/master
REVERT: 591bdb1 1、增加照片链接
REVERT: 5e41434 Update alpha1.md
REVERT: 93c8408 Update alpha1.md
REVERT: d65926a Update alpha1.md
REVERT: 1bfe389 Merge pull request #1 from mmCAtE/master
REVERT: bb07ec9 1、修改简介
REVERT: 7f15c00 1、修改排版
REVERT: 273639b add QQ群
REVERT: 2a4179a 修改备注和说明
REVERT: f7737b3 move to alpha1
REVERT: 4544a6c init alpha
REVERT: 32586d8 Initial commit

git-subtree-dir: content/publication
git-subtree-split: 938ddb04a272c533684fd6fe626777048bd99a1a
恢复
Squashed 'content/publication/' changes from 938ddb0..2d57922

2d57922 合并ownone提交内容
021cc3a delete an e, it's not suppose be there
24c9720 add web.py 2 study
9b31275 增加新内容 web.py学习（二）
a272110 修改语法错误
5937a4f 修改图片路径
44cd6f0 修改标题
69858c4 Update alpha4.md
a49404c Update alpha4.md
870da13 修改换行
5456adc 文字错误
40751c0 修改前言
0d8d953 抢了郎中的地盘
ae6ff74 依然是只改错别字
e0da448 no message
c4b174e 添加作者照片
bde1fbd Update alpha4.md
2e2955a Update alpha4.md
59c3232 合并九州专题
1d3d8be 修改专题内容
1be8435 修改code block
3804d7f 添加附加内容
0a46554 flask
960ca07 hightjs
21968c0 增加flask内容
a090c87 修改
93e0fab init alpha4
f8fc801 推荐
b6b99c0 Update alpha3.md
91f0cd7 修改三处文法问题
3af3a84 图片
53d2283 Merge remote-tracking branch 'origin/master'
da446b4 Update alpha3.md
280c7ab Update alpha3.md
d7478ac no message
1c2f4c0 添加照片
ea6ebf0 对细节做了一些修正。
90caa79 修改列表链接
c76ba41 Create alpha7.md
d75c4b8 增加TIP，一段代码，资源推荐栏目内容
aad9ae9 格式
cac713e 格式
0c4247a Update alpha1.md
6027645 添加专栏
c994570 修改格式
3f5a449 ownone column
f0005ae Update README.md
e609989 Update README.md
1eeb435 qq群二维码
bc4bb0f alph5
c3e4239 修改版本号
b724964 修改图片路径
11a61f7 添加微博
36a1da3 修改代码配色
e8b7871 添加照片
5ee1da7 Update alpha2.md
f51d973 Update alpha2.md
bac7159 Update alpha2.md
c29ce92 Update alpha2.md
10eeab6 Update alpha2.md
034f6d7 Update alpha2.md
e83dbaa Update alpha2.md
a0872fe Update alpha2.md
1bfe9cf Update alpha2.md
d973d58 Update alpha2.md
4b28117 Update alpha2.md
e88817c Update alpha2.md
cefbb38 修改目录
4c97912 修改目录
9ca7380 添加代码
4720388 Delete test.rst
6579014 Create test.rst
fbcd51d 编辑简明笔记
bcf339d Update alpha2.md
5f345ec Update alpha2.md
a9a2a78 Update alpha2.md
94a6ae8 Update alpha2.md
e8ea53f 修改排版
9311d05 修改代码块的语法markdown
690f676 Merge pull request #3 from linsongze/master
cb4bafc 内容完成
fcf4b80 creat
c339548 修改大小
eac3b05 添加微信
c0fdb28 Update README.md
e907e0c Update README.md
bfd4622 Create alpha2.md
928b033 排版错误
dc9166b 群号与说明
734cacd 前言
f7f9250 Update alpha1.md
60fc8b1 Merge pull request #2 from mmCAtE/master
591bdb1 1、增加照片链接
5e41434 Update alpha1.md
93c8408 Update alpha1.md
d65926a Update alpha1.md
1bfe389 Merge pull request #1 from mmCAtE/master
bb07ec9 1、修改简介
7f15c00 1、修改排版
273639b add QQ群
2a4179a 修改备注和说明
f7737b3 move to alpha1
4544a6c init alpha
32586d8 Initial commit
REVERT: 938ddb0 modify disqus for octopress
REVERT: a3f4ed4 缺失图片
REVERT: 2a2be99 Merge commit '4c03750f07f0d230497ef619615378083851afd4'
REVERT: 4c03750 Squashed 'content/publication/' changes from 5937a4f..a272110
REVERT: 67bdf15 合并
REVERT: 9ee2ab5 Squashed 'content/publication/' changes from 44cd6f0..5937a4f
REVERT: f4c0339 修改配置
REVERT: 41b320c 修改publication图片目录
REVERT: dc0d436 增加问答系统
REVERT: fb6f00a 添加图片和highlight
REVERT: d16071f 修改fabric发布
REVERT: 89fea48 subtree
REVERT: da3fb1e Merge commit '8cf118f3fefaa2d8728ccaa7f192af1ac1a3d832' as 'content/docs'
REVERT: 8cf118f Squashed 'content/docs/' content from commit bad0347
REVERT: 2f1224e title
REVERT: cc8ec26 修改title
REVERT: b7206cf 修改配置
REVERT: b2bf993 修改帮助
REVERT: 19d5147 添加pelican环境
REVERT: 159fdea Squashed 'content/publication/' content from commit 44cd6f0
REVERT: 2478045 Merge commit '159fdeac8bcbb1b58744f6ff5369b4d7f0c986fc' as 'content/publication'
REVERT: b082770 修改README
REVERT: cf0769f Initial commit

git-subtree-dir: content/publication
git-subtree-split: 2d579224b9e54c5ad8c39d16d1890f51f21c3266
Merge commit '78d11de6a19d82990850408ac936763fd999fd96'
合并publication
语法