Closed jswiesner closed 2 years ago
@afsmythe FYI I'll be manually merging this PR using the command line and favoring the vip6 branch to handle merge conflicts for the following files:
docs/built_rst/csv/single_page.rst docs/built_rst/xml/single_page.rst sample_feed.xml scripts/vippy/rest.py
Now that 6.0 has been released, merging the vip6 branch into master.