OSDN Git Service

Merge branch 'master' into tinydb
authoryamat0jp <yamat0jp@yahoo.co.jp>
Tue, 6 Dec 2016 12:27:08 +0000 (21:27 +0900)
committeryamat0jp <yamat0jp@yahoo.co.jp>
Tue, 6 Dec 2016 12:27:08 +0000 (21:27 +0900)
commitd2e847013ab7d364ecfc97ecb58edbbbed7de115
tree787913c7480ad149873d10d26e1b9ce6251bc7d1
parent4630abe844b38f866c460c911499c57c7e910915
parent7cf9315d2e4baa59a1d5a96cc86d07e42aa58960
Merge branch 'master' into tinydb

# Conflicts:
# index.py
# requirements.txt
requirements.txt