OSDN Git Service

delete to commit beyond merge error
authoryamat0jp <yamat0jp@yahoo.co.jp>
Sat, 10 Dec 2016 07:40:33 +0000 (16:40 +0900)
committeryamat0jp <yamat0jp@yahoo.co.jp>
Sat, 10 Dec 2016 07:40:33 +0000 (16:40 +0900)
commit41567e5826932afc0d6cd4db1fc948a46ef77609
treeb38a407edcbf4b7b59c4e7996684bb01cff49ebb
parenta3005a007df0ccbf4c2709e77c1863dc714db156
delete to commit beyond merge error
and
add js files
21 files changed:
Procfile [new file with mode: 0644]
README.md [new file with mode: 0644]
index.py [new file with mode: 0755]
pybbs/login.htm
pybbs/mentenance.htm
pybbs/modules/admin.htm
pybbs/modules/footer.htm [changed mode: 0644->0755]
pybbs/modules/full.htm [changed mode: 0644->0755]
pybbs/modules/index.htm
pybbs/modules/search.htm
pybbs/mysearch.htm [changed mode: 0644->0755]
pybbs/title.htm [new file with mode: 0644]
pybbs/top.htm [changed mode: 0644->0755]
requirements.txt [new file with mode: 0644]
runtime.txt [new file with mode: 0644]
static/css/main.css
static/db/bak.json [new file with mode: 0644]
static/db/db.json [new file with mode: 0644]
static/js/jquery-1.10.2.min.js [new file with mode: 0755]
static/js/jquery-ui-1.10.3.custom.min.js [new file with mode: 0755]
static/js/script.js [changed mode: 0644->0755]