0
Merge branch 'master' of https://github.com/xiechao06/Flask-Report
0
Merge branch 'master' of https://github.com/xiechao06/Flask-Report into foo

Conflicts:
	flask_report/templates/report____/report_short_description.html
Merge pull request #24 from xiechao06/issue23

Issue23