Commit Graph

6 Commits

Author SHA1 Message Date
bob 9686511dde Merge branch 'master' of http://git.eanbo.cn/xieshen/drought
# Conflicts:
#	dashboard/templates/dashboard/common/left_menu.html
#	drought/urls.py
2019-01-03 15:36:25 +08:00
bob d20cb6d145 #20181228 2018-12-28 10:22:40 +08:00
RS d83a7aaf27 Merge branch 'master' of http://git.eanbo.cn/baoliang/drought
# Conflicts:
#	templates/registration/login.html
2018-07-06 15:29:43 +08:00
RS ea9cbaa997 Merge branch 'master' of http://git.eanbo.cn/baoliang/drought
# Conflicts:
#	templates/registration/login.html
2018-07-06 15:11:00 +08:00
baoliang 19042742bb init 2018-07-06 15:04:06 +08:00
baoliang a7fd28bcd8 init 2018-07-06 14:42:00 +08:00