OSDN Git Service
(root)
/
pybbs
/
pybbs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4630abe
7cf9315
)
Merge branch 'master' into tinydb
author
yamat0jp
<yamat0jp@yahoo.co.jp>
Tue, 6 Dec 2016 12:27:08 +0000
(21:27 +0900)
committer
yamat0jp
<yamat0jp@yahoo.co.jp>
Tue, 6 Dec 2016 12:27:08 +0000
(21:27 +0900)
# Conflicts:
# index.py
# requirements.txt
1
2
requirements.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
requirements.txt
index
f240b88
,
063a61f
..
0d250e5
---
1
/
requirements.txt
---
2
/
requirements.txt
+++ b/
requirements.txt
@@@
-1,7
-1,5
+1,4
@@@
- backports-abc==0.5
- backports.ssl-match-hostname==3.5.0.1
- certifi==2016.9.26
- singledispatch==3.4.0.3
- six==1.10.0
+ gunicorn==19.6.0
tinydb==3.2.1
tornado==4.4.2
-pymongo==3.4.0
+ gunicorn==19.6.0