Commit c78c6f7a authored 5 years ago by arsenij.ustjanzew

merged master; resolved merge conflicts

Merge branch 'master' into navbar_items

# Conflicts:
#	DESCRIPTION
#	NAMESPACE
#	R/AllGenerics.R
#	R/assemble.R
#	R/get_set.R
#	man/i2dashboard-class.Rd

parents c096a585 6c1ffd72

No related branches found

No related tags found

1 merge request!12Navbar items

Pipeline #122276 failed 5 years ago