Code

sync with remote head#2

Code

Merged

daniel94104 merged 41 commits intodaniel94104:masterdaniel94104/Xin-Yue:masterfrom sikaozhe1997:mastersikaozhe1997/Xin-Yue:masterCopy head branch name to clipboardApr 24, 2018

+182

Commits

Commits on Apr 23, 2018

• Merge pull request #1 from sikaozhe1997/master

  Show description for 0c757a4
  zhaobenx

  authored
  0c757a4

  Copy full SHA for 0c757a4

Commits on Apr 24, 2018

• Create 北大学生岳昕：一个北大既得利益者的自述.md

  lhuyuel

  authored
  4116016

  Copy full SHA for 4116016

• Renamed file

  lhuyuel

  authored
  c398d32

  Copy full SHA for c398d32

• minor comment change

  lhuyuel

  authored
  06b37cc

  Copy full SHA for 06b37cc

• Merge pull request #162 from lhuyuel/master

  Show description for 9b480f1
  sikaozhe1997

  authored
  9b480f1

  Copy full SHA for 9b480f1

• delete .DS_store files generated by macOS

  hangim

  committed
  44f529e

  Copy full SHA for 44f529e

• add .gitignore

  hangim

  committed
  1454457

  Copy full SHA for 1454457

• Merge pull request #2 from sikaozhe1997/master

  Show description for 621d6cc
  zhaobenx

  authored
  621d6cc

  Copy full SHA for 621d6cc

• Set theme jekyll-theme-minimal

  zhaobenx

  committed
  0f7a30f

  Copy full SHA for 0f7a30f

• Merge pull request #192 from hangim/master

  Show description for b79732b
  sikaozhe1997

  authored
  b79732b

  Copy full SHA for b79732b

• 添加4.8邓同学被约谈现场文章截图，以及readme文件中添加该图片链接

  lotuslianlian

  committed
  d563c92

  Copy full SHA for d563c92

• 增加gitpage的索引功能，从而在github.io/Xin-Yue的根目录可以显示目前收集的全部网页

  zhaobenx

  committed
  4dc1ed0

  Copy full SHA for 4dc1ed0

• Merge pull request #3 from sikaozhe1997/master

  Show description for 9142ea1
  zhaobenx

  authored
  9142ea1

  Copy full SHA for 9142ea1

• Update url issue

  zhaobenx

  committed
  f331147

  Copy full SHA for f331147

• Merge branch 'master' of https://github.com/zhaobenx/Xin-Yue

  zhaobenx

  committed
  fcf093a

  Copy full SHA for fcf093a

• Change Url

  zhaobenx

  committed
  e0a52f9

  Copy full SHA for e0a52f9

• Revert "Change Url"

  Show description for 0cc876f
  zhaobenx

  committed
  0cc876f

  Copy full SHA for 0cc876f

• Add 沈阳事件.md

  liruqi

  committed
  b14a52d

  Copy full SHA for b14a52d

• Reformat url

  zhaobenx

  committed
  3858be4

  Copy full SHA for 3858be4

• Remove empty lines

  liruqi

  committed
  3eb5496

  Copy full SHA for 3eb5496

• Merge pull request #272 from liruqi/master

  Show description for d40424c
  sikaozhe1997

  authored
  d40424c

  Copy full SHA for d40424c

• Merge pull request #254 from zhaobenx/master

  Show description for d1709a0
  sikaozhe1997

  authored
  d1709a0

  Copy full SHA for d1709a0

• resolve conflict

  lotuslianlian

  authored
  900a191

  Copy full SHA for 900a191

• resolve conflict

  lotuslianlian

  authored
  f448d75

  Copy full SHA for f448d75

• resolve conflict

  lotuslianlian

  authored
  387f982

  Copy full SHA for 387f982

• resolve conflict

  lotuslianlian

  committed
  9b439fa

  Copy full SHA for 9b439fa

• Merge branch 'master' into DayChan-branch

  lotuslianlian

  authored
  52bdfb9

  Copy full SHA for 52bdfb9

• 添加黄河清的公开信

  wwelder

  committed
  0d4a44a

  Copy full SHA for 0d4a44a

• Update 黄河清：致汴大外院学妹的一封信.md

  wwelder

  authored
  2a8124a

  Copy full SHA for 2a8124a

• Merge pull request #331 from GameBunring/master

  Show description for a826c16
  sikaozhe1997

  authored
  a826c16

  Copy full SHA for a826c16

• Merge pull request #228 from DayChan/DayChan-branch

  Show description for 42b96ea
  sikaozhe1997

  authored
  42b96ea

  Copy full SHA for 42b96ea

• Edit 现场link ,cuz the PKU bbs cannot be accessed without PKU IP just now

  lotuslianlian

  committed
  ab15290

  Copy full SHA for ab15290

• Merge pull request #346 from DayChan/DayChan-branch

  Show description for 6b568f7
  sikaozhe1997

  authored
  6b568f7

  Copy full SHA for 6b568f7

• Update README.md

  lotuslianlian

  authored
  a08b94b

  Copy full SHA for a08b94b

• sorry,edit the wrong url

  lotuslianlian

  committed
  3ffcbef

  Copy full SHA for 3ffcbef

• Merge pull request #351 from DayChan/DayChan-branch

  Show description for de70f37
  sikaozhe1997

  authored
  de70f37

  Copy full SHA for de70f37

• 添加人民日报评论 如何聆听“年轻的声音”？ | 锐评

  IIzzaya

  committed
  cb2f824

  Copy full SHA for cb2f824

• Update README.md

  

  zxf969175364

  authored
  7b3ad0d

  Copy full SHA for 7b3ad0d

• Merge pull request #355 from IIzzaya/master

  Show description for 24216b0
  sikaozhe1997

  authored
  24216b0

  Copy full SHA for 24216b0

• Merge pull request #362 from zxf969175364/patch-1

  Show description for 16ffd17
  sikaozhe1997

  authored
  16ffd17

  Copy full SHA for 16ffd17

• Merge pull request #370 from daniel94104/master

  Show description for 2045c0c
  sikaozhe1997

  authored
  2045c0c

  Copy full SHA for 2045c0c