Merge remote-tracking branch 'origin/master' into issue48
0
Merge remote-tracking branch 'origin/master' into issue9
Merge branch 'master' of https://github.com/xiechao06/Flask-Report into issue9
0
Merge remote-tracking branch 'origin/issue9' into issue9
fix error
checkout
checkout
Merge branch 'issue48' into issue9
汉化
fix #9
fix #9
fix #9
Merge branch 'master' into issue9

Conflicts:
	flask_report/base.py
	flask_report/data_set.py
	flask_report/report.py