Merge branch '80_add_bi_view_editor' of https://github.com/onesteinbv/reporting-engine into 80_add_bi_view_editor

Conflicts:
	bi_view_editor/README.rst
pull/47/head
astirpe 2016-03-09 22:06:07 +01:00
commit a5f92fa407

Diff Content Not Available