Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2016-05-17 15:25:26 -07:00
commit f5c0d9ced9
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ node_modules/
/.events /.events
/.events2 /.events2
/dist/ /dist/
/builds/*.gz

2
Makefile
View File

@ -340,7 +340,7 @@ stable : distready
web : index.html distready web : index.html distready
-git commit -am "Build web page." -git commit -am "Build web page."
cd dist && git merge --no-commit -s ours master cd dist && git merge --no-commit -s ours master
cd dist && git checkout master README.md index.html web.css img cd dist && git checkout master README.md index.html web.css img .gitignore .gitattributes
cd dist && git commit -am "Update web page." cd dist && git commit -am "Update web page."
update : update :