add guide to weekend, change mode merge.py
1 parent c9467ef commit 55227d4e9a9a73b4de1d1bfa0b3989e8a6904e3b
@Takayuki Kurosawa Takayuki Kurosawa authored on 10 Jan 2017
Showing 2 changed files
View
index.html
View
merge.py 100644 → 100755
File mode changed